Adjust up/down keybind impls to account for upstream changes