Improve empty source use case, clean up imports.