Major changes to handling of imports in checker