Fix more minor testsuite fallout from improved switch optimization