Avoid excessive parserstate pop()