Comments todo
Comments/todo - and minor cleanup (use of NonPatchingDataStructureImplType_)