Thanks, that clears up our commit_manually() calls for me.

That patch sounds like it would make our code cleaner but, yeah, I don't want to introduce timing bugs through an unmaintained shim either.