Ditch the G* types