Closing, as I've now pushed this patch.