Updates to conform to the new <context-free-parser> output.
Merge pull request #838 from Polymer/context-free-parser-changes

Updates to conform to the new <context-free-parser> output.