Merge: Simplify management of primitive types