Enhance modifier key behavior; fixes #4