The old code had gotten crufty with all the refactors. This simplifies
it down to what it really means.

Also, add a bunch of tests.