Refix no-metadata handling.