Fix deferred enc/dec params and fallback (#6500).