vchoi_fork

[svn-r25884] Description:
    Minor code cleanups found while reviewing 'avoid truncate' branch.

Tested on:
    MacOSX/64 10.10.1 (amazon) w/serial & parallel
    (too minor to require h5committest)