Make untrapping containers an occupation: always takes 5 turns, you either find a trap or you don’t, and you can’t try again on that container. This avoids having to type out #untrap multiple times for no apparent results.

This could also extend to untrap attempts on doors.