I'm going to apply the patch again locally and then see what I can do to fix up the remaining cases.