Thank you for updating the status of the issue.
I have to admit that I completely missed the CF bot. Lesson learned.
For whatever is worth, my previous comment that the patch improves
readability also applies to the updated version of the patch.
The CF bot seems happy now, which means that your assessment as
to the error and fix are correct.
So :+1: from me.