Context Navigation

Changes between Initial Version and Version 1 of Ticket #22354, comment 5

initial	v1
2	2	> Viper007Bond: Your code is not logically equivalent to mine. Please explain why you would make that additional change?
3	3
4		Good catch.
	4	Good catch. My patches should be disregarded.
5	5
6	6	The whole logic on that block is messy. I'm tempted to say we replace it with a cleaner `switch` and two `if`s.