Ok, I had tried to compare against newer versions in the 2.4 branch but must have gotten that wrong. I do see the updated lines which are an even better fix.