Cleaning up/simplifying term reference scenario.