Moved code around in pyre.term