All tests passing new version. Preliminary verdict: much faster! *pads self on shoulder*