Improved keyboard support, fixes class never removed when focus moves from a submenu link to a non-menu link.