Improved var-checker and tweaked all the issues it found.