Agreed, I'm not expecting a huge route registration refactory to become part of this PR, just figured I'd bring it up as a thought before I forgot about it. :)