The refactor has begun in earnest.
Nitpicking.