WYRL: more little tweaks to the automaton.  Unfortunately, the canonicalisation process does not yet resolve #272.