Fix ignore of modules, simplify exclude