grammar: make better use of aliases for specifying generated types

Signed-off-by: Peter Williams <pwil3058@gmail.com>