I have a few cleanups to do in a subsequent patch. Will add this to that patch.