Corrected Lint nitpicks.