Removed the 'resolve to var' feature.  More trouble than it's worth.