Merge "Use stashed ParserOutput during saving."