[RAFACT] In ImportDirWrapper : minor cleanup