An additional comment why those extra checks are needed indeed sounds like a
good idea.

I will keep this in mind when I write the next set of patches touching this.

Till then we can probably safely close this bug.