vchoi_fork

[svn-r13741] Description:
    Minor formatting & warning reduction code cleanups

Tested on:
    Mac OS X/32 10.4.9 (amazon)
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)