shad/MT: minor refactoring.