Rework compound type handling: