Cleaned up the XML parser grammar.

This resolves all shift/reduce and reduce/reduce conflicts that were previously
present.