Once I fixed the build issues and added back a couple of our private patches I was able to build a working Subsurface-mobile for iOS based on Kirigami 1.0 (plus patches).
Nice. Took me a LOT longer than I wanted, but hey... it's all good. 4.5.2.1525 should be available for testing on TestFlight, soon. Next I'll have to get this to work for Android :-) /D