- Large rewrite of switch code. Instead of having switch parameters in

the (monstrously large) system structure, there is now a global
  'switchdata' structure originating in switches.c. This makes it much
  easier to see what's happening.
  * Note: although this code has been tested, there might be some
    hiccups, because doing multiple search&replace actions over all
    files is bound to cause some problems.

src/xmlout.c

@@ -17,6 +17,7 @@
 #include "system.h"
 #include "binding.h"
 #include "arachne.h"		// for get_semitrace_length
+#include "switches.h"
 
 #include "xmlout.h"
 
@@ -411,7 +412,7 @@ isProtocolInvolved (const System sys, const Protocol p)
 int
 isEventInteresting (const System sys, const Roledef rd)
 {
-  if (sys->switchHuman)
+  if (switches.human)
     {
       if (rd->type != CLAIM)
 	{
@@ -624,7 +625,7 @@ xmlOutSysInfo (const System sys)
   xmlPrint ("<system>");
   xmlindent++;
 
-  xmlOutInteger ("match", sys->match);
+  xmlOutInteger ("match", switches.match);
 
   xmlInitialKnowledge (sys);
   xmlInvolvedProtocolRoles (sys);