Small refactoring of the Variable model.