Fix build on HEAD for switch to VarSet