Remove TermDefinition and transfer def'n building into contextualizer