Refactor to use Variable.