contrib/objcwrapper: merge some type-related tokens in grammar