Thanks! I have merged those changes into my versions of s7, and harmonized s7_load and g_load (there are still some differences due to the contexts in which they are called). As always, I need to write more tests.