Continued fixes for Visual Studio 2008 32-bit build.
Merge branch 'HEAD' of https://github.com/ddmarshall/Code-Eli.git