A bit more consolidation
Some work, saved as it is.

NB: All tests pass, for what that is worth.