A ton of NPC fixes related to making the prototypes strict.