Fix some regressions removing the VariableValue model