lots more usage of CONTAINER_LOCK_HELPER_ - still only about 1/2 of what is needed, but a start...