Move the definition of clone for Variable around to work