Looks like this whole block was moved to game::load_npcs, right? I didn't actually compare the contents of the two blocks (yet), so just making sure I understand the broad outlines of the code.