Refactor parameter override so options.type overrides options.packaging in one place.