Merge "veridex: fix a sketchy switch scope"