Slight tweak to metadata layout.