Cleanup unions used to implement optional fields.