Remove the graveyard flag from the Castle level, but make it so that undead cannot follow you upstairs past the Valley of the Dead, preventing wraith luring. (Could also apply this restriction to levelport and branchport).