Fix player: and npc: argument issues when using tags. Fix player: and npc: from resolving prematurely in an if statement.