Trogolodytes quest end shortcut

[Egon the Monkey]

Could this quest have a shortcut added to the end of it like the ladder out of Wolves Pt 2? All the talk of traps reminded me that it's very frustrating to walk back through the traps after beating the quest and keep falling in the water because you don't have anyone with Disable Trap to mark them. Either that, or a [swim back up] placeable underwater that takes you to the front part of the pit traps room.