Issue #2: Minimizing unnecessary conversions in initial CMI patch.