Rearrange some type params