Further PackageTemplate cleanups #3372
Description
#3297 opened a bit of a can of worms as we start looking back at PackageTemplate and the mess there. There's a lot of stuff that came up there that should be done in a followup.