More hdf5 consolidation.
Even more hdf5 consolidation.