More streamlining of dungeon.c