Move mtwt hygiene code to its own mod

Also fixes some FIXME's
Fix FIXME 5074 in the mtwt hygiene code