more code review nits
more aggressive asserting :(