These extra key handlers should probably stay within `click`