FYI, I've created a branch so I can dump the final bits (all WIP) for the revamped unwind. Once I've finished the dump, I can use that to merge back into the mainline. Andrew