Minor clean up of term handling