Remove evil bitfields, add a spare field.