More consolidation of hdf5 code.