fix for new container_ref and composite_iterator. Slightly inelegant kludge in composite_buffer for iterator to pointer conversion