Removed dependency on patched GeneratedParserUtilBase.