more use of CONTAINER_LOCK_HELPER_() for Containers