Minor update optimizing class imports in impl package.