Small refactors, increase consistency

Hi Steven,

I took a look at your code and I really liked it. I really wanted to put in a pull request, so here it is. In truth, I should probably have done three of them, to give you more leeway as far as what to accept and reject, but I think they're reasonable.

The tests still pass, FWIW :)