Swap around some type annotations