(1) This is a classic example of a "trivial fix" blowing up on one's face

unless you test it, Brian. :)  (Directory path prefix was wrong.)

(2) Also, this patch modifies the same file as patch-af, so I combined

those two (see handbook).