Remove kind-promotion for normal forms