Thanks for your suggestions; I've taken most of them. (That versus which is a hot button most style guides can't explain without resorting to "But that's how we've always heard it.")

I hope to have a camera-ready PDF for the printer by the end of the month.