Minor speed improvement to container protection, also now protects all
forms of containers and future ones