Cleanups

Continuing the cleanup process...
Probably, but either way, this change belong in a separate PR with tests, since it's doing more than just a "cleanup."  AFAIC, minus this change, this PR is ready to merge.