EZP-21129: Fixed review remarks by @lolautruche