Revert anonymous unions back to C89 named unions