> > But they don't match, so we can't unify them?
> 
> I stand corrected...

So, the patch is good as-is?