Unify the handling of containers and container ids in the metadata.