In order to get consistent treatment of local-map/keymap properties, I would like to check in the following change. Doese anybody see a problem with it?