HW8 - 70 passing.  Refactored a bit.

All remaining failing tests are "complex" or "crazy".  Got rid of some
hacky unused crap.