Further refactoring
Further refactoring
Further tweaks to literals and xsd date/time types
Further refactoring and alignment with EBNF