[GH-499] Improves use of grab/grabbing cursors