One more variable clean out, so Windows can compile.