Cleanup, and enforced better count limit on NPC/user lookups.