More tweaks to exception precedence in Key.