[63/77] Simplifications after type switch