S75926: tweak based on code review