Parse type abbreviations in signatures.

(Some other updates to grammar.txt made as well, to try to bring it
into line with what's in gramScript.)