A little bit of NPC AI cleanup.