Incorporated CL suggestions from ussuri
cleanup
Merge pull request #355 from dart-lang/fix_nits

Incorporated ussuri CL suggestions