Refactoring of non-consuming parser behaviour.