Finally returned from crazy business trip and have posted a cleaned-up version with correct B1/E distinctions.
Everyone please check to make sure I got your draft right; my computer tried to kill me a couple of times during the draft, so it's more likely than usual that I missed something.