Work with zack to clean up dart mode.