Keep track of diverted vars for use by compiler