Cleaned up how Encounters with NPCs are handled.