CShapeManager: all of this should be const auto& Can we stop pushing `#pragma optimize("",off)` to master