You are right once again (of course). Here's a new patch. Perhaps an "approver" (whoever they are) can take a look at it (as well as the other patches I posted).