Fix terminator parsing

Prefer terminators in expression ordered choice.