Code clean-up wrt unions