Putting the default terminals back into the main grammar, and starting to add some sensible defaults for the missing ones