Fix new presumbit rule violations.