A few tweaks to preserve compatibility with VC++ 6.0.
Authored by: johnhartman 2014-08-22
Parent: [r970]
Child: [r972]