Assorted clean-ups and clarifications