Changed the commit workflow (yet again…), now it seems better, or at least more streamlined.
Did the changes in the snippets scarp.php file: need to findlise changes to depending methods, repopulate PersistentObject and test the whole bit.