Scope code to current ToolSet.
Imported changes from 8054c3b and 5b80eb4.
Removed version-specific code.
Regenerated parser.