TMI-81: Clean-up after refactorings.