vchoi_fork

[svn-r7967] Purpose:
    Code cleanup for VS.NET

Description:
    Clean up several issues that VS.NET was having problems with.

Platforms tested:
    Eyeballed against Kent's bug reports.