A few more tweaks to preserve compatibility with VC++ 6.0.
Authored by: johnhartman 2014-08-27
Parent: [r974]
Child: [r976]