[#883909] review fixes.