As the title says, this branch contains the results of some code clean-up that was driven by a code review meeting.