Description:
    More minor code cleanups, while reviewing for merge to trunk.

Tested on:
    MacOSX/64 10.10.1 (amazon) w/serial & parallel
    (h5committest not required on this branch)