Restore InhabitType and flags_extra after 676a1d2f3b4270fd1e072d475472e04de4ba66e6