Merge pull request #115 from dart-lang/cleanup

Misc cleanup