reduce raw types

That would be nice, but we need a migration path for that since there's users that doesn't use 1.7 yet.