Separate polytypes into their own datatype, remove rank 2 types. Fix type synonym example.