Description:
    More small code cleanups, while reviewing.

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