Refactor phrase rules a bit