Move "name" before "literal" in expression grammar