Reorder fields for better alignment on both 32-bit and 64-bit systems