Refactor PackageTarget back into StaticTarget

No match.