Merge pull request dart-lang/package_config#115 from dart-lang/cleanup

Misc cleanup