* sim-base.h (sim_state_base): Move `magic' to end of struct.