> Done and done! New patches attached.

Oops, forgot to refresh my local branch. Here are the actual new
patches.