Cosmetic fixes (#163792, Benoît Carpentier):