Make ContextSwitch play nice with CLI, again