Add a bunch of missing cases to promoteConstantUnion. Use macros to expand all the cases more simply.