I'm fine with it as-is.

Puzzles and Puzzle Fights have always been a part of D&D, as well as fantasy literature.
Of course, appealing to anyone to actually READ something once in a while can fall on deaf ears...