Fix overrideable shipping targets for PE

The team-based conditional approach makes too many assumptions about who would
want to override the target. This path makes it much easier. If an override is
given, use it. Otherwise use the existing default target path.