scrape more parser-related defs
auto-merge staging into master