[FOLD] Code review edits.