All tests passing.  Could probably do with a bit of performance tweaking (iocperformance shows it's still very good, but it has slowed down a bit).