Another fall-out from our rewriting of argv[] now. Fixes: #12782
mentioned in commit db03cc80
mentioned in commit 6e3596ee