Simplify upgradeCodecFactory()