minor cleanups of  Patching::STLContainerWrapper<> - some to fix for gcc