Even more packer-related refactoring and cleanup