I think this is a general refactoring we could consider throughout Zanata.  It's not specific to TM.