Some more good news. I don't know why the editors we use disaagree on the line numbers, but the file you uploaded matches the one I was using (and the code insertion point is as I posted).
I have closed the ticket and added the file to the 1.4 butfix ticket.