[#883838] Review fixes.