Still 3 cheats in type soundness

But they're smaller.