Random cleanups

Just a few random cleanups as I'm trying to wrap my head around the code.  I'm building up to an upgrade of the unittests to check for more than just it slicing without error.