Fixed ambiguous DataValLit definition, though I don't know how ugly avoid is...
Changed some function names to uppercase to match the grammar.