Fix more regressions after removing the variablevalue model