More refactoring of the Term hierarchy.
Remove unnecessary code and rename methods.