[#876522] More review fixes.