Remove the union hack entirely.