Fix suggestions for non-trivial Wformat type cases (PR c/72858)