I don't think we should be doing any of that sort of refactoring as part of this ticket.
Its difficult enough to not fuck things up when removing MONGO_METHDO(), and adding refactoring into the mix is just going to make the edge cases more difficult to handle.
Not to mention the diff will be completely unreadable and the ticket would never be finished.