Fixed bogus warning because of variables not being reset.
Reported by Jeff Pyle, part of fixing issue #126.