Various minor tweaks to the metadata format.