I suggested this once for usefulness of Magic Key. Make it use magic. (via quest rule, of course).That way, key-related puzzles are still probable, as running out of magic stops it.