(Issue 655) Fixes from another self-review