Improve VariableDef administration