Simplify the grammar for TypeName.
Add a couple of more tests for the missing literals.