I like the idea. Can see why this switch does not surround anything here, maybe we can come up with a different metaphor for doing this in the future (maybe some kind of annotation)