NewFactorContext -> NewTermContext
Document util package