Refactor PackageTarget back into StaticTarget