Various small clean-ups

No structural or logical changes.

* Some assertions have comment strings to be more informative.
* Changes to make pull-review quieter.