Avoid infinite loops in type-scanners more efficiently