Merge pull request #638 from dart-lang/lint_changes

minor lint related changes