Already dealt with the leaks.  Total oversight on my part.  Am about to push the new version.

On the matter of the block, I just think it's cleaner this way.  Makes it more obvious when we do need to lock without the fugliness of the block too :)