Misc cleanup.
Nominal keyword support... might be broken