Nearing the end of this mega-refactoring and I'm left thinking "could I have broken this up any?". Answer right now is still "No", but not looking forward to the tests.

@howbazaar I'll confidently say the answer is certainly yes. And the question is how many intermediate steps do you want to take along the way and are the extra effort of those steps "worth it"?