Revert "Removed key-map? because it could be confusing due to valid null key-maps"

This reverts commit 330850aacb171025ea361a08397f7667bc60c525.