More efficient treatment of single class imports