Neat, the changes make sense and at least the partition number variableizing is going to be included in future releases.

What about the aegis-directory copying hack, can you make SIP calls with your operator work correctly with it?
I would not include that yet in official releases as it depends on your device that you back up the aegis directories before taking that into use...

I would like to see if the method Jonni proposed would work with your SIP accounts (meaning, reflash to open mode without booting to closed mode between)