Some old hard-codings of TT survived when they shouldn't have. This makes the system more polymorphic. Fixes #2425.