Remove left over non-terminals in EBNF.
Update for final W3C test location.