No real progress here. Just fixed some things in the comments that were
annoying. All tests pass.