Finish wrapping keyboard handling.