replace use of CONTAINER_LOCK_HELPER_() with CONTAINER_LOCK_HELPER_START()/CONTAINER_LOCK_HELPER_END() so that debugging works better (single step) - and so compiler error messages are clearer  about line numbers