The last one left seems like a genuine one and I'm not sure about the correct fix. I think that I'm going to remove that block of code after refactoring tho, so I'm leaving it there for now.
It doesn't compile, this is the unmodified upstream version.