More explicit key-bingings. A bit of clean-up