Further refactoring for pub.dartlang deployment