Add missing primary expressions.
Fixed lexing of system identifier.
Shorten some token names.