Expand the fix

Now includes spiked pits and expressly excludes corpse'd pits.