get rid of def-keys-for-map macro