This is a ballbreaker-commit :-/  However, it does pass one test, and it does so in a much nicer way than the tests that are now broken did pass, so I'm committing the current state of the world since this is a step forward even if the test passing status does not indicate that.