Reviewed-by: Ray Ni <ray.ni@intel.com>

Min, any reason that you don't change to switch-case for VC/VE handling together?