Before I fuck anything else over :-)
All that's left is to rewrite and test! (and improve, and document, and release...)
Taking serious shape! The rewrite is /almost/ correct.