Couple minor cleanup item.
Verified still working on Windows.  (7, vs2010).