Tiny cleanups and a few more tests.