More type prefix removals.