Selection: fix regression due to Keyboard refactor

Also remove an unused variable