A little clean-up enabled by HDF5 module updates.