collectTerms now does a collect-om rather than a collect-all