#2 needs to be made so that it only occurs when you walk through a shutter that is going to close behind you. In normal dungeons, it only doesn't happen when you have a passage or an unlocked door, but in freeform it just gets in the way since the whole point is not having to use passages.
