Yeah.  I'm with you on the ideal strategy being to break these into their own files.  (That just wants to be its own patch, as I know you agree, person who is good at separating things into their own fixes!)