Add $var resets to end of macro (see -dev version)