Improvements to phrases, additional ignored subs.