Some tidying up of the hdf5 interpreter