Drop some unnecessary mode restrictions.
Grammar for types, with a little renaming.