Note by snicolet: I use this non-functional change patch as a pretext to correct the wrong bench number I introduced in the message of the previous commit. Bench: 4059356