Rework inlined union generation