Rework more code. We need to address inner-interface conversion.