[#874153] More review fixes.