Changes to visit of CompilationUnit, fixes comparator problems