Change ov-keymap macro to ov-keymap function