Hu evidently wrote his two patches in separate branches, with the effect
that they conflict with each other.  I've applied them in the same way to
let "git merge" sort it out.