Tidying of changes introduced during merge

Added an abbreviation for repeated use of elem.second.name
Formatting around new java_new include

Author: NathanJPhillips

src/driver/sec_driver_parse_options.cpp

@@ -32,9 +32,9 @@
 #include <goto-programs/class_hierarchy.h>
 #include <goto-programs/remove_exceptions.h>
 #include <goto-programs/remove_java_new.h>
+
 #include <analyses/call_graph.h>
 #include <analyses/call_graph_helpers.h>
-
 #include <analyses/goto_check.h>
 #include <analyses/local_may_alias.h>
 

src/taint-slicer/slicing_tasks_builder.cpp

@@ -255,12 +255,11 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
         symbol_table, logger->get_message_handler());
       for(const auto &elem : symbol_table.symbols)
       {
-        if(elem.second.value.id()==ID_code &&
-           converted.count(elem.second.name)==0UL)
+        irep_idt fn_name = elem.second.name;
+        if(elem.second.value.id() == ID_code && converted.count(fn_name) == 0UL)
         {
           converter.convert_function(
-            elem.second.name,
-            goto_functions.function_map[elem.second.name]);
+            fn_name, goto_functions.function_map[fn_name]);
         }
       }
     }