Tidy up the context switcher changes

Proposal

See #409522 (closed) for original context

Edited by Mark Florian