Make global type more resilient, and fix modal keymap context