I've meant to get back to this before now, to address the patch being too general. It is a good point, to which I am uploading an updated patch that covers the specific case. Builds and tests fine here.