Fixing gimpy Visual Studio handling of multi-block statements in range-based for loops
make_unique does not quite work correctly in Visual Studio