Fix imports in the presence of types.