- More config subsystem cleanups

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1644 82007160-df01-0410-b94d-b575c5fd34c7

28 files changed, 3227 insertions, 3388 deletions

diff --git a/doc/example.conf b/doc/example.conf
index e260214..91d2562 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -249,12 +249,6 @@ class {
 	ping_time = 90 seconds;
 
 	/*
-	 * ping_warning: how fast a server must reply to a PING before
-	 * a warning to opers is generated.
-	 */
-	ping_warning = 15 seconds;
-
-	/*
 	 * connectfreq: only used in server classes.  Specifies the delay
 	 * between autoconnecting to servers.
 	 */
diff --git a/doc/example.efnet.conf b/doc/example.efnet.conf
index 2af4d03..47a8873 100644
--- a/doc/example.efnet.conf
+++ b/doc/example.efnet.conf
@@ -267,12 +267,6 @@ class {
 	ping_time = 90 seconds;
 
 	/*
-	 * ping_warning: how fast a server must reply to a PING before
-	 * a warning to opers is generated.
-	 */
-	ping_warning = 15 seconds;
-
-	/*
 	 * connectfreq: only used in server classes.  Specifies the delay
 	 * between autoconnecting to servers.
 	 *
diff --git a/doc/example.quick.conf b/doc/example.quick.conf
index 65f0859..80e65ce 100644
--- a/doc/example.quick.conf
+++ b/doc/example.quick.conf
@@ -89,7 +89,6 @@ class {
 class {
 	name = "server";
 	ping_time = 5 minutes;
-	ping_warning = 15 seconds;
 	connectfreq = 5 minutes;
 	max_number = 1;
 	sendq=2 megabytes;
diff --git a/include/channel.h b/include/channel.h
index dca2ff5..d81dac8 100644
--- a/include/channel.h
+++ b/include/channel.h
@@ -91,7 +91,7 @@ struct Ban
   time_t when;
   struct irc_ssaddr addr;
   int bits;
-  char type;
+  int type;
 };
 
 extern dlink_list global_channel_list;
diff --git a/include/client.h b/include/client.h
index 7ac400b..03d1d78 100644
--- a/include/client.h
+++ b/include/client.h
@@ -292,10 +292,9 @@ struct Client
 #define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
 #define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
 #define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
-#define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
-#define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
-#define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
-#define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
+#define FLAGS_FINISHED_AUTH 0x00800000 /**< Client has been released from auth */
+#define FLAGS_FLOOD_NOTICED 0x01000000 /**< Notice to opers about this flooder has been sent */
+#define FLAGS_SERVICE       0x02000000 /**< Client/server is a network service */
 
 #define HasFlag(x, y) ((x)->flags &   (y))
 #define AddFlag(x, y) ((x)->flags |=  (y))
@@ -405,10 +404,6 @@ struct Client
 #define IsPingSent(x)		((x)->flags & FLAGS_PINGSENT)
 #define ClearPingSent(x)	((x)->flags &= ~FLAGS_PINGSENT)
 
-#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
-#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
-#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
-
 #define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
 #define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
 
diff --git a/include/conf.h b/include/conf.h
index ac17aa2..bf27c55 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -25,9 +25,6 @@
 #ifndef INCLUDED_s_conf_h
 #define INCLUDED_s_conf_h
 #include "config.h"
-#ifdef HAVE_LIBCRYPTO
-#include <openssl/rsa.h>
-#endif
 #include "ircd_defs.h"
 #include "motd.h"               /* MessageFile */
 #include "client.h"
@@ -36,8 +33,6 @@
 
 
 
-extern struct Callback *client_check_cb;
-
 struct conf_parser_context
 {
   unsigned int boot;
@@ -66,7 +61,7 @@ enum maskitem_type
   CONF_SERVICE  = 1 << 14,
   CONF_OPER     = 1 << 15,
   CONF_HUB      = 1 << 16, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
-  CONF_CLASS    = 1 << 17
+  CONF_CLASS    = 1 << 17  /* XXX Same here; just for /stats Y|y */
 };
 
 struct split_nuh_item
@@ -85,49 +80,45 @@ struct split_nuh_item
 
 struct MaskItem
 {
-  struct MaskItem *hnext;
-  dlink_node node;
+  struct MaskItem   *hnext;
+  dlink_node         node;
+  dlink_list         leaf_list;
+  dlink_list         hub_list;
   enum maskitem_type type;
-  unsigned int     dns_failed;
-  unsigned int     dns_pending;
-  unsigned int     flags;
-  unsigned int     modes;
-  unsigned int     port;
-  unsigned int     count;
-  unsigned int     action;
-  int              clients;  /* Number of *LOCAL* clients using this */
-  int              bits;
-  unsigned int     aftype;
-  unsigned int     htype;
-  unsigned int     active;
-  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
-  struct irc_ssaddr addr;  /* ip to connect to */
-  char *           name;
-  char *           host;     /* host part of user@host */
-  char *           passwd;
-  char *           spasswd;  /* Password to send. */
-  char *	   reason;
-  char *           user;     /* user part of user@host */
-  time_t           hold;     /* Hold action until this time (calendar time) */
-  time_t           setat;
-  struct ClassItem *class;  /* Class of connection */
-#ifdef HAVE_LIBCRYPTO
-  /* certs */
-  char *cipher_list;
-  char *           rsa_public_key_file;
-  RSA *            rsa_public_key;
-#endif
-  void *regexuser;
-  void *regexhost;
-  dlink_list leaf_list;
-  dlink_list hub_list;
+  unsigned int       dns_failed;
+  unsigned int       dns_pending;
+  unsigned int       flags;
+  unsigned int       modes;
+  unsigned int       port;
+  unsigned int       count;
+  unsigned int       aftype;
+  unsigned int       active;
+  unsigned int       htype;
+  unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
+  int                bits;
+  time_t             hold;     /* Hold action until this time (calendar time) */
+  time_t             setat;
+  struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
+  struct irc_ssaddr  addr;  /* ip to connect to */
+  struct ClassItem  *class;  /* Class of connection */
+  char              *name;
+  char              *host;     /* host part of user@host */
+  char              *passwd;
+  char              *spasswd;  /* Password to send. */
+  char              *reason;
+  char              *user;     /* user part of user@host */
+  char              *cipher_list;
+  char              *rsa_public_key_file;
+  void              *rsa_public_key;
+  void              *regexuser;
+  void              *regexhost;
 };
 
 struct CidrItem
 {
   dlink_node node;
   struct irc_ssaddr mask;
-  int number_on_this_cidr;
+  unsigned int number_on_this_cidr;
 };
 
 
@@ -137,9 +128,6 @@ struct CidrItem
 #define IsConfGline(x)          ((x)->type == CONF_GLINE)
 
 /* MaskItem->flags */
-
-/* Generic flags... */
-/* access flags... */
 #define CONF_FLAGS_DO_IDENTD            0x00000001
 #define CONF_FLAGS_LIMIT_IP             0x00000002
 #define CONF_FLAGS_NO_TILDE             0x00000004
@@ -153,7 +141,6 @@ struct CidrItem
 #define CONF_FLAGS_EXEMPTGLINE          0x00000400
 #define CONF_FLAGS_CAN_FLOOD            0x00000800
 #define CONF_FLAGS_NEED_PASSWORD        0x00001000
-/* server flags */
 #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
 #define CONF_FLAGS_ENCRYPTED            0x00004000
 #define CONF_FLAGS_IN_DATABASE          0x00008000
@@ -304,12 +291,10 @@ struct server_info
   char *description;
   char *network_name;
   char *network_desc;
-#ifdef HAVE_LIBCRYPTO
   char *rsa_private_key_file;
-  RSA *rsa_private_key;
-  SSL_CTX *server_ctx;
-  SSL_CTX *client_ctx;
-#endif
+  void *rsa_private_key;
+  void *server_ctx;
+  void *client_ctx;
   int hub;
   struct irc_ssaddr ip;
   struct irc_ssaddr ip6;
@@ -332,7 +317,6 @@ struct logging_entry
   unsigned int use_logging;
 };
 
-extern dlink_list class_items;
 extern dlink_list server_items;
 extern dlink_list cluster_items;
 extern dlink_list xconf_items;
@@ -358,7 +342,8 @@ extern struct MaskItem *conf_make(enum maskitem_type);
 extern void read_conf_files(int);
 extern int attach_conf(struct Client *, struct MaskItem *);
 extern int attach_connect_block(struct Client *, const char *, const char *);
-extern int get_conf_ping(const struct MaskItem *, int *);
+extern int check_client(struct Client *);
+
 
 extern void detach_conf(struct Client *, enum maskitem_type);
 extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
diff --git a/include/conf_class.h b/include/conf_class.h
index eae14b4..9a72b64 100644
--- a/include/conf_class.h
+++ b/include/conf_class.h
@@ -34,21 +34,20 @@ struct ClassItem
   dlink_node node;
   dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
   dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
+  unsigned int ref_count;
   unsigned int max_sendq;
   unsigned int max_recvq;
-  int con_freq;
-  int ping_freq;
-  int ping_warning;
-  int max_total;
-  int max_local;
-  int max_global;
-  int max_ident;
-  int max_perip;
-  int ref_count;
-  int cidr_bitlen_ipv4;
-  int cidr_bitlen_ipv6;
-  int number_per_cidr;
-  int active;
+  unsigned int con_freq;
+  unsigned int ping_freq;
+  unsigned int max_total;
+  unsigned int max_local;
+  unsigned int max_global;
+  unsigned int max_ident;
+  unsigned int max_perip;
+  unsigned int cidr_bitlen_ipv4;
+  unsigned int cidr_bitlen_ipv6;
+  unsigned int number_per_cidr;
+  unsigned int active;
 };
 
 /* address of default class conf */
@@ -59,13 +58,12 @@ extern const dlink_list *class_get_list(void);
 extern void class_free(struct ClassItem *);
 extern void class_init(void);
 extern const char *get_client_class(const dlink_list *const);
-extern unsigned int get_client_ping(const dlink_list *const, int *);
+extern unsigned int get_client_ping(const dlink_list *const);
 extern unsigned int get_sendq(const dlink_list *const);
 extern unsigned int get_recvq(const dlink_list *const);
 extern struct ClassItem *class_find(const char *, int);
 extern void class_mark_for_deletion(void);
 extern void class_delete_marked(void);
-extern void *check_client(va_list args);
 extern void destroy_cidr_class(struct ClassItem *);
 extern void rebuild_cidr_class(struct ClassItem *, struct ClassItem *);
 extern int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
diff --git a/include/hostmask.h b/include/hostmask.h
index 219ad80..a8dc7c1 100644
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -39,6 +39,8 @@ struct AddressRec
 {
   /* masktype: HM_HOST, HM_IPV4, HM_IPV6 -A1kmm */
   enum hostmask_type masktype;
+  /* type: CONF_CLIENT, CONF_DLINE, CONF_KLINE etc... -A1kmm */
+  enum maskitem_type type;
 
   union
   {
@@ -53,9 +55,6 @@ struct AddressRec
     const char *hostname;
   } Mask;
 
-  /* type: CONF_CLIENT, CONF_DLINE, CONF_KLINE etc... -A1kmm */
-  enum maskitem_type type;
-
   /* Higher precedences overrule lower ones... */
   unsigned int precedence;
 
diff --git a/include/userhost.h b/include/userhost.h
index 2608507..40d5607 100644
--- a/include/userhost.h
+++ b/include/userhost.h
@@ -29,9 +29,9 @@ struct NameHost
 {
   dlink_node node;		/* point to other names on this hostname */
   char name[USERLEN + 1];
-  int icount;			/* number of =local= identd on this name*/
-  int gcount;			/* global user count on this name */
-  int lcount;			/* local user count on this name */
+  unsigned int icount;		/* number of =local= identd on this name*/
+  unsigned int gcount;		/* global user count on this name */
+  unsigned int lcount;		/* local user count on this name */
 };
 
 struct UserHost
@@ -41,7 +41,7 @@ struct UserHost
   char host[HOSTLEN + 1];
 };
 
-extern void count_user_host(const char *, const char *, int *, int *, int *);
+extern void count_user_host(const char *, const char *, unsigned int *, unsigned int *, unsigned int *);
 extern void add_user_host(const char *, const char *, int);
 extern void delete_user_host(const char *, const char *, int global);
 #endif  /* INCLUDED_userhost_h */
diff --git a/modules/m_dline.c b/modules/m_dline.c
index c375707..d61bf16 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -96,25 +96,23 @@ remove_dline_match(const char *host)
 {
   struct irc_ssaddr iphost, *piphost;
   struct MaskItem *conf;
-  int t;
+  int t = 0;
+  int aftype = 0;
 
   if ((t = parse_netmask(host, &iphost, NULL)) != HM_HOST)
   {
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype = AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
     piphost = &iphost;
   }
   else
-  {
-    t = 0;
     piphost = NULL;
-  }
 
-  if ((conf = find_conf_by_address(host, piphost, CONF_DLINE, t, NULL, NULL, 0)))
+  if ((conf = find_conf_by_address(host, piphost, CONF_DLINE, aftype, NULL, NULL, 0)))
   {
     if (IsConfDatabase(conf))
     {
@@ -148,7 +146,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
   struct irc_ssaddr daddr;
   struct MaskItem *conf=NULL;
   time_t tkline_time=0;
-  int bits, t;
+  int bits = 0, aftype = 0, t = 0;
   const char *current_date = NULL;
   time_t cur_time;
   char hostip[HOSTIPLEN + 1];
@@ -231,14 +229,14 @@ mo_dline(struct Client *client_p, struct Client *source_p,
 
 #ifdef IPV6
   if (t == HM_IPV6)
-    t = AF_INET6;
+    aftype = AF_INET6;
   else
 #endif
-    t = AF_INET;
+    aftype = AF_INET;
 
   parse_netmask(dlhost, &daddr, NULL);
 
-  if ((conf = find_dline_conf(&daddr, t)) != NULL)
+  if ((conf = find_dline_conf(&daddr, aftype)) != NULL)
   {
     creason = conf->reason ? conf->reason : def_reason;
     if (IsConfExemptKline(conf))
@@ -283,7 +281,7 @@ ms_dline(struct Client *client_p, struct Client *source_p,
   struct irc_ssaddr daddr;
   struct MaskItem *conf=NULL;
   time_t tkline_time=0;
-  int bits, t;
+  int bits = 0, aftype = 0, t = 0;
   const char *current_date = NULL;
   time_t cur_time;
   char hostip[HOSTIPLEN + 1];
@@ -350,14 +348,14 @@ ms_dline(struct Client *client_p, struct Client *source_p,
 
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype= AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
 
     parse_netmask(dlhost, &daddr, NULL);
 
-    if ((conf = find_dline_conf(&daddr, t)) != NULL)
+    if ((conf = find_dline_conf(&daddr, aftype)) != NULL)
     {
       creason = conf->reason ? conf->reason : def_reason;
       if (IsConfExemptKline(conf))
diff --git a/modules/m_gline.c b/modules/m_gline.c
index f0e18b5..ecc96d9 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -94,25 +94,23 @@ remove_gline_match(const char *user, const char *host)
 {
   struct irc_ssaddr iphost, *piphost;
   struct MaskItem *conf;
-  int t;
+  int t = 0;
+  int aftype = 0;
 
   if ((t = parse_netmask(host, &iphost, NULL)) != HM_HOST)
   {
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype = AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
     piphost = &iphost;
   }
   else
-  {
-    t = 0;
     piphost = NULL;
-  }
 
-  if ((conf = find_conf_by_address(host, piphost, CONF_GLINE, t, user, NULL, 0)))
+  if ((conf = find_conf_by_address(host, piphost, CONF_GLINE, aftype, user, NULL, 0)))
   {
     if (IsConfDatabase(conf))
     {
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 513b860..d4a646a 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -257,25 +257,23 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
   const char *reason;
   struct irc_ssaddr iphost, *piphost;
   struct MaskItem *conf = NULL;
-  int t;
+  int t = 0;
+  int aftype = 0;
 
-  if ((t = parse_netmask(lhost, &iphost, &t)) != HM_HOST)
+  if ((t = parse_netmask(lhost, &iphost, NULL)) != HM_HOST)
   {
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype = AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
     piphost = &iphost;
   }
   else
-  {
-    t = 0;
     piphost = NULL;
-  }
 
-  if ((conf = find_conf_by_address(lhost, piphost, CONF_KLINE, t, luser, NULL, 0)))
+  if ((conf = find_conf_by_address(lhost, piphost, CONF_KLINE, aftype, luser, NULL, 0)))
   {
     if (warn)
     {
@@ -428,26 +426,24 @@ static int
 remove_kline_match(const char *host, const char *user)
 {
   struct irc_ssaddr iphost, *piphost;
-  struct MaskItem *conf = NULL;
-  int t;
+  struct MaskItem *conf;
+  int t = 0;
+  int aftype = 0;
 
   if ((t = parse_netmask(host, &iphost, NULL)) != HM_HOST)
   {
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype = AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
     piphost = &iphost;
   }
   else
-  {
-    t = 0;
     piphost = NULL;
-  }
 
-  if ((conf = find_conf_by_address(host, piphost, CONF_KLINE, t, user, NULL, 0)))
+  if ((conf = find_conf_by_address(host, piphost, CONF_KLINE, aftype, user, NULL, 0)))
   {
     if (IsConfDatabase(conf))
     {
diff --git a/modules/m_stats.c b/modules/m_stats.c
index 2c292e6..ed75e39 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -31,6 +31,7 @@
 #include "listener.h"    /* show_ports */
 #include "s_gline.h"
 #include "conf.h"
+#include "conf_class.h"
 #include "hostmask.h"
 #include "numeric.h"     /* ERR_xxx */
 #include "send.h"        /* sendto_one */
@@ -265,7 +266,7 @@ stats_memory(struct Client *source_p, int parc, char *parv[])
   }
 #endif
   /* count up all classes */
-  class_count = dlink_list_length(&class_items);
+  class_count = dlink_list_length(class_get_list());
 
   count_whowas_memory(&wwu, &wwm);
   watch_count_memory(&watch_list_headers, &watch_list_memory);
diff --git a/modules/m_testline.c b/modules/m_testline.c
index 086b141..674f9c7 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -62,7 +62,7 @@ mo_testline(struct Client *client_p, struct Client *source_p,
   struct MaskItem *conf = NULL;
   struct irc_ssaddr ip;
   int host_mask;
-  int t;
+  enum hostmask_type t;
   int matches = 0;
   char userhost[HOSTLEN + USERLEN + 2];
   struct split_nuh_item nuh;
diff --git a/modules/m_xline.c b/modules/m_xline.c
index e512ac2..dfdaaeb 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -361,10 +361,9 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
                          get_oper_name(source_p), conf->name,
                          conf->reason);
     sendto_one(source_p,
-               ":%s NOTICE %s :Added X-Line [%s] [%d] [%s]",
+               ":%s NOTICE %s :Added X-Line [%s] [%s]",
                MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
-               source_p->name, conf->name,
-               conf->action, conf->reason);
+               source_p->name, conf->name, conf->reason);
     ilog(LOG_TYPE_IRCD, "%s added X-Line for [%s] [%s]",
          get_oper_name(source_p), conf->name, conf->reason);
   }
diff --git a/src/client.c b/src/client.c
index 890e893..ac21ea6 100644
--- a/src/client.c
+++ b/src/client.c
@@ -233,13 +233,12 @@ static void
 check_pings_list(dlink_list *list)
 {
   char scratch[32];        /* way too generous but... */
-  struct Client *client_p; /* current local client_p being examined */
-  int ping, pingwarn;      /* ping time value from client */
-  dlink_node *ptr, *next_ptr;
+  int ping = 0;      /* ping time value from client */
+  dlink_node *ptr = NULL, *next_ptr = NULL;
 
   DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
   {
-    client_p = ptr->data;
+    struct Client *client_p = ptr->data;
 
     /*
     ** Note: No need to notify opers here. It's
@@ -252,9 +251,9 @@ check_pings_list(dlink_list *list)
     }
 
     if (!IsRegistered(client_p))
-      ping = CONNECTTIMEOUT, pingwarn = 0;
+      ping = CONNECTTIMEOUT;
     else
-      ping = get_client_ping(&client_p->localClient->confs, &pingwarn);
+      ping = get_client_ping(&client_p->localClient->confs);
 
     if (ping < CurrentTime - client_p->localClient->lasttime)
     {
@@ -266,7 +265,6 @@ check_pings_list(dlink_list *list)
 	 * it is still alive.
 	 */
 	SetPingSent(client_p);
-	ClearPingWarning(client_p);
 	client_p->localClient->lasttime = CurrentTime - ping;
 	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
       }
@@ -294,24 +292,6 @@ check_pings_list(dlink_list *list)
                    (int)(CurrentTime - client_p->localClient->lasttime));
           exit_client(client_p, &me, scratch);
         }
-        else if (!IsPingWarning(client_p) && pingwarn > 0 &&
-	         (IsServer(client_p) || IsHandshake(client_p)) &&
-	         CurrentTime - client_p->localClient->lasttime >= ping + pingwarn)
-        {
-          /*
-           * If the server hasn't replied in pingwarn seconds after sending
-           * the PING, notify the opers so that they are aware of the problem.
-           */
-	  SetPingWarning(client_p);
-          sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
-	                       "Warning, no response from %s in %d seconds",
-	                       get_client_name(client_p, HIDE_IP), pingwarn);
-	  sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
-	                       "Warning, no response from %s in %d seconds",
-	                       get_client_name(client_p, MASK_IP), pingwarn);
-          ilog(LOG_TYPE_IRCD, "No response from %s in %d seconds",
-	       get_client_name(client_p, HIDE_IP), pingwarn);
-        }
       }
     }
   }
diff --git a/src/conf.c b/src/conf.c
index a0d5171..cafa9e0 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -54,7 +54,6 @@
 #include "conf_db.h"
 #include "conf_class.h"
 
-struct Callback *client_check_cb = NULL;
 struct config_server_hide ConfigServerHide;
 
 /* general conf items link list root, other than k lines etc. */
@@ -82,17 +81,13 @@ static void clear_out_old_conf(void);
 static void expire_tklines(dlink_list *);
 static void garbage_collect_ip_entries(void);
 static int hash_ip(struct irc_ssaddr *);
-static int verify_access(struct Client *, const char *);
+static int verify_access(struct Client *);
 static int attach_iline(struct Client *, struct MaskItem *);
 static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
 static dlink_list *map_to_list(enum maskitem_type);
 static struct MaskItem *find_regexp_kline(const char *[]);
 static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
 
-/*
- * bit_len
- */
-static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
 
 /* usually, with hash tables, you use a prime number...
  * but in this case I am dealing with ip addresses,
@@ -103,7 +98,7 @@ static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
 struct ip_entry
 {
   struct irc_ssaddr ip;
-  int count;
+  unsigned int count;
   time_t last_attempt;
   struct ip_entry *next;
 };
@@ -218,11 +213,24 @@ conf_free(struct MaskItem *conf)
   MyFree(conf);
 }
 
-static const unsigned int shared_bit_table[] =
-  { 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
+static const struct shared_flags
+{
+  const unsigned int type;
+  const unsigned char letter;
+} flag_table[] = {
+  { SHARED_KLINE,   'K' },
+  { SHARED_UNKLINE, 'U' },
+  { SHARED_XLINE,   'X' },
+  { SHARED_UNXLINE, 'Y' },
+  { SHARED_RESV,    'Q' },
+  { SHARED_UNRESV,  'R' },
+  { SHARED_LOCOPS,  'L' },
+  { SHARED_DLINE,   'D' },
+  { SHARED_UNDLINE, 'E' },
+  { 0, '\0' }
+};
 
-/* report_confitem_types()
- *
+/*
  * inputs	- pointer to client requesting confitem report
  *		- ConfType to report
  * output	- none
@@ -234,6 +242,7 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
   dlink_node *ptr = NULL, *dptr = NULL;
   struct MaskItem *conf = NULL;
   const struct ClassItem *class = NULL;
+  const struct shared_flags *shared = NULL;
   char buf[12];
   char *p = NULL;
 
@@ -277,17 +286,19 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
 #endif
 
   case CONF_ULINE:
+    shared = flag_table;
     DLINK_FOREACH(ptr, uconf_items.head)
     {
       conf = ptr->data;
 
       p = buf;
 
-      /* some of these are redundant for the sake of 
-       * consistency with cluster{} flags
-       */
       *p++ = 'c';
-      flags_to_ascii(conf->action /* XXX XXX */, shared_bit_table, p, 0);
+      for (; shared->type; ++shared)
+        if (shared->type & conf->flags)
+          *p++ = shared->letter;
+        else
+          *p++ = ToLower(shared->letter);
 
       sendto_one(source_p, form_str(RPL_STATSULINE),
 		 me.name, source_p->name, conf->name,
@@ -295,6 +306,7 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
 		 conf->host?conf->host: "*", buf);
     }
 
+    shared = flag_table;
     DLINK_FOREACH(ptr, cluster_items.head)
     {
       conf = ptr->data;
@@ -302,7 +314,11 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
       p = buf;
 
       *p++ = 'C';
-      flags_to_ascii(conf->flags /* XXX XXX */, shared_bit_table, p, 0);
+      for (; shared->type; ++shared)
+        if (shared->type & conf->flags)
+          *p++ = shared->letter;
+        else
+          *p++ = ToLower(shared->letter);
 
       sendto_one(source_p, form_str(RPL_STATSULINE),
                  me.name, source_p->name, conf->name,
@@ -360,7 +376,6 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
     DLINK_FOREACH(ptr, server_items.head)
     {
       p = buf;
-
       conf = ptr->data;
 
       buf[0] = '\0';
@@ -429,15 +444,12 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
  *		  Look for conf lines which have the same
  * 		  status as the flags passed.
  */
-void *
-check_client(va_list args)
+int
+check_client(struct Client *source_p)
 {
-  struct Client *source_p = va_arg(args, struct Client *);
-  const char *username = va_arg(args, const char *);
   int i;
  
-  /* I'm already in big trouble if source_p->localClient is NULL -db */
-  if ((i = verify_access(source_p, username)))
+  if ((i = verify_access(source_p)))
     ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]", 
          source_p->name, source_p->sockhost);
 
@@ -495,18 +507,17 @@ check_client(va_list args)
      break;
   }
 
-  return (i < 0 ? NULL : source_p);
+  return (i < 0 ? 0 : 1);
 }
 
 /* verify_access()
  *
  * inputs	- pointer to client to verify
- *		- pointer to proposed username
  * output	- 0 if success -'ve if not
  * side effect	- find the first (best) I line to attach.
  */
 static int
-verify_access(struct Client *client_p, const char *username)
+verify_access(struct Client *client_p)
 {
   struct MaskItem *conf = NULL, *rkconf = NULL;
   char non_ident[USERLEN + 1] = { '~', '\0' };
@@ -521,7 +532,7 @@ verify_access(struct Client *client_p, const char *username)
   }
   else
   {
-    strlcpy(non_ident+1, username, sizeof(non_ident)-1);
+    strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
     conf = find_address_conf(client_p->host,non_ident,
 			     &client_p->localClient->ip,
 			     client_p->localClient->aftype,
@@ -589,11 +600,10 @@ verify_access(struct Client *client_p, const char *username)
 static int
 attach_iline(struct Client *client_p, struct MaskItem *conf)
 {
-//  struct MaskItem *conf = NULL;
   struct ClassItem *class = NULL;
   struct ip_entry *ip_found;
   int a_limit_reached = 0;
-  int local = 0, global = 0, ident = 0;
+  unsigned int local = 0, global = 0, ident = 0;
 
   ip_found = find_or_add_ip(&client_p->localClient->ip);
   ip_found->count++;
@@ -894,15 +904,18 @@ detach_conf(struct Client *client_p, enum maskitem_type type)
       case CONF_CLIENT:
       case CONF_OPER:
       case CONF_SERVER:
-        assert(conf->clients > 0);
-
+        assert(conf->ref_count > 0);
         assert(conf->class->ref_count > 0);
 
         if (conf->type == CONF_CLIENT)
           remove_from_cidr_check(&client_p->localClient->ip, conf->class);
         if (--conf->class->ref_count == 0 && conf->class->active == 0)
+        {
           class_free(conf->class);
-        if (--conf->clients == 0 && conf->active == 0)
+          conf->class = NULL;
+        }
+
+        if (--conf->ref_count == 0 && conf->active == 0)
           conf_free(conf);
 
         break;
@@ -935,7 +948,7 @@ attach_conf(struct Client *client_p, struct MaskItem *conf)
       return TOO_MANY;    /* Already at maximum allowed */
 
   conf->class->ref_count++;
-  conf->clients++;
+  conf->ref_count++;
 
   dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
 
@@ -1018,6 +1031,9 @@ map_to_list(enum maskitem_type type)
 {
   switch(type)
   {
+  case CONF_RKLINE:
+    return(&rkconf_items);
+    break;
   case CONF_RXLINE:
     return(&rxconf_items);
     break;
@@ -1053,13 +1069,13 @@ map_to_list(enum maskitem_type type)
  *		- pointer to name string to find
  *		- pointer to user
  *		- pointer to host
- *		- optional action to match on as well
+ *		- optional flags to match on as well
  * output       - NULL or pointer to found struct MaskItem
  * side effects - looks for a match on name field
  */
 struct MaskItem *
 find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
-                        const char *host, unsigned int action)
+                        const char *host, unsigned int flags)
 {
   dlink_node *ptr=NULL;
   struct MaskItem *conf=NULL;
@@ -1104,7 +1120,7 @@ find_matching_name_conf(enum maskitem_type type, const char *name, const char *u
       {
 	if ((user == NULL && (host == NULL)))
 	  return conf;
-	if ((conf->action & action) != action)
+	if ((conf->flags & flags) != flags)
           continue;
 	if (EmptyString(conf->user) || EmptyString(conf->host))
 	  return conf;
@@ -1299,7 +1315,7 @@ set_default_conf(void)
   /* verify init_class() ran, this should be an unnecessary check
    * but its not much work.
    */
-  assert(class_default == class_items.tail->data);
+  assert(class_default == class_get_list()->tail->data);
 
 #ifdef HAVE_LIBCRYPTO
   ServerInfo.rsa_private_key = NULL;
@@ -1617,35 +1633,29 @@ expire_tklines(dlink_list *tklist)
   {
     conf = ptr->data;
 
+    if (!conf->hold || conf->hold > CurrentTime)
+      continue;
+
     if (conf->type == CONF_XLINE)
     {
-      if (conf->hold && conf->hold <= CurrentTime)
-      {
-        if (ConfigFileEntry.tkline_expire_notices)
-	  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+      if (ConfigFileEntry.tkline_expire_notices)
+        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                                "Temporary X-line for [%s] expired", conf->name);
-	conf_free(conf);
-      }
+      conf_free(conf);
     }
     else if (conf->type == CONF_NRESV)
     {
-      if (conf->hold && conf->hold <= CurrentTime)
-      {
-        if (ConfigFileEntry.tkline_expire_notices)
-	  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+      if (ConfigFileEntry.tkline_expire_notices)
+        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                                "Temporary RESV for [%s] expired", conf->name);
-	conf_free(conf);
-      }
+      conf_free(conf);
     }
     else if (conf->type == CONF_CRESV)
-    { /* XXX XXX */
-      if (conf->hold && conf->hold <= CurrentTime)
-      {
-        if (ConfigFileEntry.tkline_expire_notices)
-	  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+    {
+      if (ConfigFileEntry.tkline_expire_notices)
+        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                                "Temporary RESV for [%s] expired", conf->name);
-	delete_channel_resv(conf);
-      }
+      delete_channel_resv(conf);
     }
   }
 }
@@ -1658,7 +1668,7 @@ expire_tklines(dlink_list *tklist)
  */
 static const struct oper_privs
 {
-  const unsigned int oprivs;
+  const unsigned int flag;
   const unsigned char c;
 } flag_list[] = {
   { OPER_FLAG_ADMIN,       'A' },
@@ -1682,14 +1692,14 @@ oper_privs_as_string(const unsigned int port)
 {
   static char privs_out[16];
   char *privs_ptr = privs_out;
-  unsigned int i = 0;
+  const struct oper_privs *opriv = flag_list;
 
-  for (; flag_list[i].oprivs; ++i)
+  for (; opriv->flag; ++opriv)
   {
-    if (port & flag_list[i].oprivs)
-      *privs_ptr++ = flag_list[i].c;
+    if (port & opriv->flag)
+      *privs_ptr++ = opriv->c;
     else
-      *privs_ptr++ = ToLowerTab[flag_list[i].c];
+      *privs_ptr++ = ToLower(opriv->c);
   }
 
   *privs_ptr = '\0';
@@ -1842,7 +1852,7 @@ clear_out_old_conf(void)
       /* XXX This is less than pretty */
       if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
       {
-        if (!conf->clients)
+        if (!conf->ref_count)
 	  conf_free(conf);
       }
       else if (conf->type == CONF_XLINE  ||
@@ -1908,14 +1918,9 @@ clear_out_old_conf(void)
   MyFree(AdminInfo.description);
   AdminInfo.description = NULL;
 
-  /* operator{} and class{} blocks are freed above */
   /* clean out listeners */
   close_listeners();
 
-  /* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
-   * exempt{} and gecos{} blocks are freed above too
-   */
-
   /* clean out general */
   MyFree(ConfigFileEntry.service_name);
   ConfigFileEntry.service_name = NULL;
@@ -1924,30 +1929,6 @@ clear_out_old_conf(void)
   delete_isupport("EXCEPTS");
 }
 
-#define BAD_PING (-1)
-
-/* get_conf_ping()
- *
- * inputs       - pointer to struct MaskItem
- *              - pointer to a variable that receives ping warning time
- * output       - ping frequency
- * side effects - NONE
- */
-int
-get_conf_ping(const struct MaskItem *conf, int *pingwarn)
-{
-  if (conf != NULL)
-  {
-    if (conf->class)
-    {
-      *pingwarn = conf->class->ping_warning;
-      return conf->class->ping_freq;
-    }
-  }
-
-  return BAD_PING;
-}
-
 /* conf_add_class_to_conf()
  *
  * inputs       - pointer to config item
@@ -2001,7 +1982,7 @@ conf_add_server(struct MaskItem *conf, const char *class_name)
 {
   conf_add_class_to_conf(conf, class_name);
 
-  if (!conf->host || !conf->name)
+  if (EmptyString(conf->host) || EmptyString(conf->name))
   {
     sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
                          "Bad connect block");
@@ -2398,14 +2379,6 @@ find_user_host(struct Client *source_p, char *user_host_or_nick,
 int
 valid_comment(struct Client *source_p, char *comment, int warn)
 {
-  if (strchr(comment, '"'))
-  {
-    if (warn)
-      sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
-                 me.name, source_p->name);
-    return 0;
-  }
-
   if (strlen(comment) > REASONLEN)
     comment[REASONLEN-1] = '\0';
 
@@ -2555,31 +2528,3 @@ split_nuh(struct split_nuh_item *const iptr)
     }
   }
 }
-
-/*
- * flags_to_ascii
- *
- * inputs	- flags is a bitmask
- *		- pointer to table of ascii letters corresponding
- *		  to each bit
- *		- flag 1 for convert ToLower if bit missing 
- *		  0 if ignore.
- * output	- none
- * side effects	- string pointed to by p has bitmap chars written to it
- */
-static void
-flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
-	       int lowerit)
-{
-  unsigned int mask = 1;
-  int i = 0;
-
-  for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
-  {
-    if (flags & mask)
-      *p++ = bit_table[i];
-    else if (lowerit)
-      *p++ = ToLower(bit_table[i]);
-  }
-  *p = '\0';
-}
diff --git a/src/conf_class.c b/src/conf_class.c
index ee2a2b3..d1698a8 100755
--- a/src/conf_class.c
+++ b/src/conf_class.c
@@ -102,8 +102,6 @@ class_init(void)
   class_default->max_total = MAXIMUM_LINKS_DEFAULT;
   class_default->max_sendq = DEFAULT_SENDQ;
   class_default->max_recvq = DEFAULT_RECVQ;
-
-  client_check_cb = register_callback("check_client", check_client);
 }
 
 const char *
@@ -124,10 +122,9 @@ get_client_class(const dlink_list *const list)
 }
 
 unsigned int
-get_client_ping(const dlink_list *const list, int *pingwarn)
+get_client_ping(const dlink_list *const list)
 {
   const dlink_node *ptr = NULL;
-  int ping = 0;
 
   if ((ptr = list->head)) {
     const struct MaskItem *conf = ptr->data;
@@ -135,9 +132,7 @@ get_client_ping(const dlink_list *const list, int *pingwarn)
     assert(aconf->class);
     assert(aconf->type & (CONF_OPERATOR | CONF_CLIENT | CONF_SERVER));
 
-    ping = get_conf_ping(conf, pingwarn);
-    if (ping > 0)
-      return ping;
+    return conf->class->ping_freq;
   }
 
   return class_default->ping_freq;
@@ -248,12 +243,12 @@ cidr_limit_reached(int over_rule,
   dlink_node *ptr = NULL;
   struct CidrItem *cidr = NULL;
 
-  if (class->number_per_cidr <= 0)
+  if (class->number_per_cidr == 0)
     return 0;
 
   if (ip->ss.ss_family == AF_INET)
   {
-    if (class->cidr_bitlen_ipv4 <= 0)
+    if (class->cidr_bitlen_ipv4 == 0)
       return 0;
 
     DLINK_FOREACH(ptr, class->list_ipv4.head)
@@ -317,7 +312,7 @@ remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
 
   if (ip->ss.ss_family == AF_INET)
   {
-    if (aclass->cidr_bitlen_ipv4 <= 0)
+    if (aclass->cidr_bitlen_ipv4 == 0)
       return;
 
     DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
diff --git a/src/conf_lexer.c b/src/conf_lexer.c
index e944de5..e7d67cd 100644
--- a/src/conf_lexer.c
+++ b/src/conf_lexer.c
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 238
-#define YY_END_OF_BUFFER 239
+#define YY_NUM_RULES 237
+#define YY_END_OF_BUFFER 238
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,24 +373,24 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[1546] =
+static yyconst flex_int16_t yy_accept[1539] =
     {   0,
-        4,    4,  239,  237,    4,    3,  237,    5,  237,  237,
-        6,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-      237,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-      237,  237,  237,  237,  237,  237,    4,    3,    0,    7,
-        5,  236,    0,    2,    5,    6,    0,    0,    0,    0,
+        4,    4,  238,  236,    4,    3,  236,    5,  236,  236,
+        6,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      236,  236,  236,  236,  236,  236,    4,    3,    0,    7,
+        5,  235,    0,    2,    5,    6,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   68,    0,  230,    0,    0,    0,    0,    0,    0,
-        0,  235,    0,    0,    0,    0,    0,    0,    0,   96,
+        0,   68,    0,  229,    0,    0,    0,    0,    0,    0,
+        0,  234,    0,    0,    0,    0,    0,    0,    0,   96,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,   12,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  217,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  216,    0,    0,
         0,    0,    0,   30,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,   64,    0,    0,    0,    0,
@@ -398,153 +398,152 @@ static yyconst flex_int16_t yy_accept[1546] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  203,    0,    0,    0,
-        0,    0,    0,  143,    0,    0,  146,    0,    0,    0,
-        0,  205,  128,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  202,    0,    0,    0,
+        0,    0,    0,  142,    0,    0,  145,    0,    0,    0,
+        0,  204,  127,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  164,    0,    0,    0,    0,    0,   13,
-        0,  195,  225,    0,    0,    0,    0,    0,    0,    0,
-        0,  216,  198,    0,    0,   28,    0,    0,    0,    0,
+        0,    0,    0,  163,    0,    0,    0,    0,    0,   13,
+        0,  194,  224,    0,    0,    0,    0,    0,    0,    0,
+        0,  215,  197,    0,    0,   28,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,   41,    0,    0,
-      200,    0,    0,    0,    0,    0,    0,    0,   63,  219,
+      199,    0,    0,    0,    0,    0,    0,    0,   63,  218,
 
         0,    0,    0,   69,   70,    0,    0,   73,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,   90,    0,    0,    0,   94,    0,    0,
-        0,    0,    0,  103,    0,    0,  189,    0,  111,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  124,    0,
-        0,    0,    0,    0,    0,  147,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  151,    0,
-        0,    0,    0,    0,    0,    0,  160,    0,    0,    0,
-        0,  215,    0,    0,    0,    9,    0,    0,    0,  224,
-        0,    0,  196,    0,    0,   21,    0,    0,  199,    0,
+        0,    0,    0,  103,    0,    0,  188,    0,  110,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  123,    0,
+        0,    0,    0,    0,    0,  146,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  150,    0,
+        0,    0,    0,    0,    0,    0,  159,    0,    0,    0,
+        0,  214,    0,    0,    0,    9,    0,    0,    0,  223,
+        0,    0,  195,    0,    0,   21,    0,    0,  198,    0,
 
         0,    0,   34,    0,    0,   37,    0,    0,    0,    0,
         0,   42,    0,   44,    0,   46,    0,    0,    0,    0,
-        0,    0,  218,    0,    0,    0,    0,  229,    0,    0,
+        0,    0,  217,    0,    0,    0,    0,  228,    0,    0,
        75,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  234,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  233,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  115,    0,  118,    0,    0,    0,    0,    0,    0,
-        0,  137,    0,    0,    0,    0,    0,    0,  201,    0,
-      148,  134,    0,    0,    0,    0,    0,    0,  135,    0,
+        0,  114,    0,  117,    0,    0,    0,    0,    0,    0,
+        0,  136,    0,    0,    0,    0,    0,    0,  200,    0,
+      147,  133,    0,    0,    0,    0,    0,    0,  134,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  161,    0,    0,  214,  163,    0,    0,    0,   11,
+        0,  160,    0,    0,  213,  162,    0,    0,    0,   11,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,   40,    0,    0,
         0,    0,    0,    0,    0,    0,    0,   58,    0,    0,
-        0,    0,    0,  228,    0,    0,    0,    0,    0,    0,
-       78,  213,   80,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  233,    0,    0,  221,    0,  188,
+        0,    0,    0,  227,    0,    0,    0,    0,    0,    0,
+       78,  212,   80,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  232,    0,    0,  220,    0,  187,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,  106,    0,    0,
 
-        0,    0,    0,    0,  114,    0,    0,  119,  120,    0,
-        0,    0,    0,    0,  223,    0,  138,    0,    0,  144,
+        0,    0,    0,  113,    0,    0,  118,  119,    0,    0,
+        0,    0,    0,  222,    0,  137,    0,    0,  143,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  153,  204,    0,    0,    0,  192,
-        0,    0,    0,  162,  210,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   18,    0,   22,   23,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       45,    0,    0,    0,    0,    0,   53,    0,    0,    0,
+        0,    0,    0,  152,  203,    0,    0,    0,  191,    0,
+        0,    0,  161,  209,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   18,    0,   22,   23,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   45,
+        0,    0,    0,    0,    0,   53,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,    0,  220,    0,  187,  202,    0,
+        0,    0,    0,    0,  219,    0,  186,  201,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  122,    0,    0,    0,    0,  222,
-        0,    0,    0,  141,    0,    0,    0,    0,    0,    0,
+        0,    0,  121,    0,    0,    0,    0,  221,    0,    0,
+        0,  140,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  155,  154,    0,  191,  157,    0,    0,
-        0,    0,    0,    0,    0,   14,  211,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  206,
+        0,  154,  153,    0,  190,  156,    0,    0,    0,    0,
+        0,    0,    0,   14,  210,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  205,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,   65,    0,    0,    0,    0,  227,    0,
-        0,    0,    0,    0,  186,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  232,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  100,    0,  105,    0,  207,    0,
-        0,    0,    0,  107,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   65,    0,    0,    0,    0,  226,    0,    0,    0,
+        0,    0,  185,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  231,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  100,    0,  105,    0,  206,    0,    0,    0,
+        0,  107,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       15,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,   38,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  209,    0,
-        0,  226,    0,    0,   77,    0,    0,    0,    0,    0,
-       82,   83,    0,    0,    0,   86,  231,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  182,    0,  109,    0,    0,    0,  116,  117,
-      121,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  156,    0,
-        0,    0,    1,    0,    1,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   15,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   38,
 
-      197,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   55,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  166,    0,    0,   84,    0,    0,   85,    0,
-        0,    0,   56,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  112,    0,
-        0,    0,    0,    0,    0,  139,  140,    0,  208,  145,
+        0,    0,    0,    0,    0,  208,    0,    0,  225,    0,
+        0,   77,    0,    0,    0,    0,    0,   82,   83,    0,
+        0,    0,   86,  230,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  181,
+        0,  109,    0,    0,  115,  116,  120,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   24,    0,    0,   29,    0,
+        0,    0,    0,    0,  155,    0,    0,    0,    1,    0,
+        1,    0,    0,    0,    0,    0,  196,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   54,    0,   59,    0,    0,    0,    0,    0,
-        0,    0,  184,  175,    0,   81,    0,    0,  190,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  194,    0,  108,    0,    0,    0,  125,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      158,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       31,    0,    0,    0,   36,   39,    0,    0,    0,   47,
-       48,    0,    0,    0,   61,    0,    0,    0,    0,    0,
-
-        0,    0,   76,    0,    0,    0,    0,    0,    0,    0,
-       92,   93,   95,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  110,  113,    0,    0,    0,    0,    0,  212,
-      149,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  173,    0,    0,    0,   10,    0,
-        0,    0,    0,    0,    0,    0,    0,   35,    0,   43,
+        0,    0,    0,    0,    0,    0,    0,   55,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  165,    0,
+        0,   84,    0,    0,   85,    0,    0,    0,   56,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  170,    0,    0,   91,    0,    0,
-       99,    0,  102,    0,    0,    0,    0,    0,    0,    0,
-      136,  142,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,  159,    0,    0,  174,  176,    0,    0,    0,
-       16,    0,    0,    0,    0,    0,    0,   49,   51,    0,
-        0,    0,   62,    0,    0,    0,    0,    0,    0,    0,
-        0,   87,    0,    0,    0,    0,    0,    0,  104,    0,
+        0,    0,    0,  111,    0,    0,    0,    0,    0,    0,
+      138,  139,    0,  207,  144,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    8,  171,    0,    0,    0,
-        0,    0,    0,    0,    0,   52,    0,    0,   60,   66,
-        0,    0,   72,    0,    0,    0,    0,    0,   88,    0,
-        0,  101,    0,    0,    0,    0,    0,    0,    0,  133,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       24,    0,    0,   29,    0,    0,    0,    0,    0,    0,
 
-        0,   19,   20,    0,    0,    0,    0,    0,    0,    0,
-       57,    0,   71,    0,    0,    0,    0,  167,    0,    0,
-       98,    0,  193,  183,    0,    0,    0,    0,    0,    0,
-        0,  177,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   54,    0,   59,
+        0,    0,    0,    0,    0,    0,    0,  183,  174,    0,
+       81,    0,    0,  189,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  193,    0,  108,
+        0,    0,  124,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  123,    0,    0,    0,  130,  132,
-      131,  180,  179,  178,  181,    0,    0,    0,   25,    0,
-        0,    0,    0,  165,    0,    0,    0,    0,  168,  169,
-        0,   97,    0,    0,    0,    0,    0,  152,    0,    0,
-        0,    0,    0,    0,    0,    0,  185,    0,    0,    0,
-
-      127,    0,    0,    0,    0,    0,    0,    0,    0,   67,
-        0,    0,    0,  126,  129,    0,    0,    0,    0,   32,
-        0,    0,   74,    0,   17,  150,    0,    0,    0,    0,
-       50,   89,    0,    0,    0,   33,    0,    0,   27,    0,
-        0,    0,   26,  172,    0
+        0,    0,    0,    0,  157,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   31,    0,    0,    0,   36,   39,
+        0,    0,    0,   47,   48,    0,    0,    0,   61,    0,
+        0,    0,    0,    0,    0,    0,   76,    0,    0,    0,
+
+        0,    0,    0,    0,   92,   93,   95,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  112,    0,    0,    0,
+        0,    0,  211,  148,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  172,    0,    0,
+        0,   10,    0,    0,    0,    0,    0,    0,    0,    0,
+       35,    0,   43,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  169,    0,    0,
+       91,    0,    0,   99,    0,  102,    0,    0,    0,    0,
+        0,    0,    0,  135,  141,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  158,    0,    0,  173,  175,
+
+        0,    0,    0,   16,    0,    0,    0,    0,    0,    0,
+       49,   51,    0,    0,    0,   62,    0,    0,    0,    0,
+        0,    0,    0,    0,   87,    0,    0,    0,    0,    0,
+        0,  104,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    8,  170,
+        0,    0,    0,    0,    0,    0,    0,    0,   52,    0,
+        0,   60,   66,    0,    0,   72,    0,    0,    0,    0,
+        0,   88,    0,    0,  101,    0,    0,    0,    0,    0,
+        0,    0,  132,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   19,   20,    0,    0,    0,    0,
+
+        0,    0,    0,   57,    0,   71,    0,    0,    0,    0,
+      166,    0,    0,   98,    0,  192,  182,    0,    0,    0,
+        0,    0,    0,    0,  176,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  122,    0,    0,
+        0,  129,  131,  130,  179,  178,  177,  180,    0,    0,
+        0,   25,    0,    0,    0,    0,  164,    0,    0,    0,
+        0,  167,  168,    0,   97,    0,    0,    0,    0,    0,
+      151,    0,    0,    0,    0,    0,    0,    0,    0,  184,
+        0,    0,    0,  126,    0,    0,    0,    0,    0,    0,
+
+        0,    0,   67,    0,    0,    0,  125,  128,    0,    0,
+        0,    0,   32,    0,    0,   74,    0,   17,  149,    0,
+        0,    0,    0,   50,   89,    0,    0,    0,   33,    0,
+        0,   27,    0,    0,    0,   26,  171,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -590,355 +589,355 @@ static yyconst flex_int32_t yy_meta[69] =
         1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1551] =
+static yyconst flex_int16_t yy_base[1544] =
     {   0,
-        0,    0, 2962, 2963, 2959,    0,   66,    0,   64,   66,
+        0,    0, 2948, 2949, 2945,    0,   66,    0,   64,   66,
        66,   98,   43,  146,   75,   58,   85,   76,  117,  109,
        51,  154,  155,  197,  239,   53,  177,   57,  125,  283,
-      323,  190,  127,  168,  128,  143, 2958,    0,   86, 2963,
-        0, 2963,  166, 2963,    0,  220,  181,  181,  181,  196,
+      323,  190,  127,  168,  128,  143, 2944,    0,   86, 2949,
+        0, 2949,  166, 2949,    0,  220,  181,  181,  181,  196,
       190,  200,  202,  203,  220,  209,  237,  237,  242,  231,
       221,  326,  247,  244,  235,  252,  256,  255,  292,  253,
       262,  276,  266,  303,  301,  264,  292,  290,  318,  332,
       327,  328,  342,  327,  341,  347,  342,  359,  351,  378,
-      347,  338,  367,  350,  378,  375,  381,  390,  391, 2917,
+      347,  338,  367,  350,  378,  375,  381,  390,  391, 2903,
 
       383,  394,  399,  386,  385,  405,  446,  403,  422,  433,
       413,  396,  405,  443,  412,  427,  417,  431,  438,  439,
-     2916,  448,  456,  498,  468,  463,  476,  474,  481,  474,
-      493,  492,  492,  478, 2963,  495,  499,  489,  506,  500,
-     2915,  499,  504,  501,  506,  508,  518,  514,  536,  523,
-      546,  523,  547, 2963,  550,  539,  536,  540,  548,  540,
+     2902,  448,  456,  498,  468,  463,  476,  474,  481,  474,
+      493,  492,  492,  478, 2949,  495,  499,  489,  506,  500,
+     2901,  499,  504,  501,  506,  508,  518,  514,  536,  523,
+      546,  523,  547, 2949,  550,  539,  536,  540,  548,  540,
       556,  549,  558,  552,  560,  559,  555,  553,  565,  558,
-      571,  571,  582,  561,  578, 2914,  583,  592,  144,  588,
-      584,  595,  591,  606,  605,  601,  595,  601, 2963,  606,
-     2913,  598,  618,  601,  600,  601,  619,  625,  626,  610,
+      571,  571,  582,  561,  578, 2900,  583,  592,  144,  588,
+      584,  595,  591,  606,  605,  601,  595,  601, 2949,  606,
+     2899,  598,  618,  601,  600,  601,  619,  625,  626,  610,
 
       624,  649,  638,  623,  645,  635,  647,  649,  638,  643,
-      658,  646,  644,  661,  666,  671, 2963,  658,  654, 2912,
-      660,  674,  658, 2963,  666,  669, 2963,  684,  682,  675,
-      689, 2963,  686,  686,  694,  701,  690,  710,  704,  713,
+      658,  646,  644,  661,  666,  671, 2949,  658,  654, 2898,
+      660,  674,  658, 2949,  666,  669, 2949,  684,  682,  675,
+      689, 2949,  686,  686,  694,  701,  690,  710,  704,  713,
       715,  699,  711,  712,  716,  721,  716,  711,  711,  720,
-      720,  729,  727, 2963,  731,  732,  735,  742, 2911, 2963,
-      757, 2963,  743,  758,  758,  751,  752, 2910,  750,  751,
-      767, 2963, 2963,  766,  753, 2963,  759,  776,  774, 2909,
-      765,  769,  757,  778,  768,  768,  783, 2963,  775,  775,
-     2963,  778,  784,  798,  811,  800,  811, 2908, 2963,  798,
-
-      805,  801,  801, 2963, 2963, 2907,  818, 2906,  823,  823,
-      820, 2905,  813,  828,  818,  830,  862,  835,  846,  850,
-      834,  842,  845, 2963,  852, 2904,  853, 2903,  852,  857,
-      857,  868,  874,  888, 2902,  863, 2963, 2901, 2963,  886,
-      874,  887,  888,  890,  886,  898,  898,  918, 2900,  904,
-      908,  906,  934,  919,  905, 2963,  914,  924,  922, 2930,
-      937,  911,  911,  928, 2930, 2897,  958,  959, 2963,  956,
-      942,  955,  956,  958,  953,  964, 2963,  969,  956,  962,
-     2896,  959,  974,  959,  962,  975,  980,  976,  978, 2963,
-      976,  984, 2895,  992, 1000, 2963, 1005, 1010, 2963, 1002,
-
-     1006, 1004, 2963, 1009, 1004, 2963, 1009, 1022, 1007, 1014,
-     1026, 2963, 1026, 2963, 1031, 2894, 1021, 1018, 1015, 1027,
-     1024, 1020, 2963, 1043, 1042, 1039, 1043, 1031, 1048, 1031,
-     2893, 2892, 1051, 2891, 1053, 1049, 1065, 1067, 1071, 1072,
+      720,  729,  727, 2949,  731,  732,  735,  742, 2897, 2949,
+      757, 2949,  743,  758,  758,  751,  752, 2896,  750,  751,
+      767, 2949, 2949,  766,  753, 2949,  759,  776,  774, 2895,
+      765,  769,  757,  778,  768,  768,  783, 2949,  775,  775,
+     2949,  778,  784,  798,  811,  800,  811, 2894, 2949,  798,
+
+      805,  801,  801, 2949, 2949, 2893,  818, 2892,  823,  823,
+      820, 2891,  813,  828,  818,  830,  862,  835,  846,  850,
+      834,  842,  845, 2949,  852, 2890,  853, 2889,  852,  857,
+      857,  868,  874,  888, 2888,  863, 2949, 2887, 2949,  886,
+      874,  887,  888,  890,  886,  898,  898,  918, 2886,  904,
+      908,  906,  934,  919,  905, 2949,  914,  924,  922, 2916,
+      937,  911,  911,  928, 2916, 2883,  958,  959, 2949,  956,
+      942,  955,  956,  958,  953,  964, 2949,  969,  956,  962,
+     2882,  959,  974,  959,  962,  975,  980,  976,  978, 2949,
+      976,  984, 2881,  992, 1000, 2949, 1005, 1010, 2949, 1002,
+
+     1006, 1004, 2949, 1009, 1004, 2949, 1009, 1022, 1007, 1014,
+     1026, 2949, 1026, 2949, 1031, 2880, 1021, 1018, 1015, 1027,
+     1024, 1020, 2949, 1043, 1042, 1039, 1043, 1031, 1048, 1031,
+     2879, 2878, 1051, 2877, 1053, 1049, 1065, 1067, 1071, 1072,
      1061, 1075, 1066, 1077, 1081, 1084, 1068, 1063, 1082, 1085,
      1077, 1088, 1094, 1094, 1084, 1101, 1100, 1109, 1116, 1110,
-     1105, 1104, 2890, 1125, 1118, 1104, 1131, 1135, 1122, 2889,
-     1126, 2963, 1125, 2963, 1134, 1138, 1129, 1143, 1151, 1154,
-     1153, 2963, 1143, 1146, 1173, 1162, 1174, 2888, 2963, 1179,
-     2887, 2963, 1183, 1173, 1182, 2886, 1169, 1185, 2963, 1179,
-
-     1170, 1178, 1178, 1190, 1186, 1187, 1197, 1187, 1196, 1204,
-     1197, 2914, 1197, 1204, 2963, 2963, 1222, 2884, 1210, 2963,
-     1221, 1215, 1218, 1225, 1220, 1235, 1230, 1234, 1226, 1226,
-     1227, 1232, 1244, 1236, 1239, 1234, 2883, 2963, 1254, 2882,
-     1246, 1251, 1275, 2881, 1245, 2880, 1261, 2879, 1267, 1248,
-     2878, 1282, 1273, 2963, 1278, 1269, 1290, 1292, 1296, 1294,
-     2963, 2963, 2963, 1297, 1287, 1301, 1294, 1289, 1300, 1305,
-     1306, 1301, 1299, 1298, 2963, 1299, 1316, 1307, 1319, 1315,
-     1332, 1334, 1338, 1329, 1334, 1342, 1333, 1331, 1346, 2877,
-     1336, 1350, 1342, 1341, 1355, 1344, 1357, 2963, 1341, 1347,
-
-     1354, 1367, 1351, 1357, 2963, 1358, 1370, 2963, 1378, 1367,
-     1385, 1367, 1383, 1391, 1375, 1395, 1395, 1392, 1381, 2963,
-     1392, 1394, 1394, 1391, 1394, 1402, 2876, 1394, 1435, 1404,
-     2875, 1407, 2874, 1411, 2963, 2963, 1421, 1422, 1409, 2963,
-     1429, 1437, 1435, 2963, 2963, 1430, 1442, 1432, 1435, 1454,
-     1457, 1445, 1456, 1453, 1448, 1443, 2963, 1445, 2963, 1460,
-     2873, 1450, 2872, 2871, 2870, 1471, 1467, 1468, 1466, 2869,
-     2963, 1462, 1474, 1485, 1490, 1485, 2963, 1481, 1495, 1487,
-     1484, 1489, 1494, 1507, 1499, 1497, 1512, 1509, 1492, 1512,
-     1499, 1514, 1515, 1505, 1516, 1528, 1532, 1521, 1536, 1531,
-
-     1546, 1542, 1547, 1547, 2868, 2963, 1530, 2963, 2963, 1549,
-     1536, 2867, 1555, 1538, 2866, 2865, 1554, 1547, 1547, 1541,
-     1555, 1556, 1551, 1556, 1563, 1569, 1559, 1565, 1566, 1578,
-     1574, 1571, 1573, 1595, 2963, 1582, 1598, 1582, 1594, 2963,
-     1588, 1599, 1595, 1591, 1603, 1598, 1605, 1604, 1600, 1613,
-     1617, 1608, 1603, 2864, 2863, 2862, 2861, 2860, 1621, 1622,
-     2859, 1624, 2858, 2963, 2963, 1627, 2963, 2963, 1631, 2857,
-       90, 1640, 1624, 1632, 1632, 2963, 2963, 1646, 1652, 1645,
-     1646, 1642, 1655, 1653, 1672, 1655, 1650, 1663, 1662, 2963,
-     1659, 1664, 1661, 1679, 1676, 1668, 1669, 1683, 1690, 1682,
-
-     1696, 1677, 1689, 2963, 1695, 1706, 1697, 1695, 1696, 1711,
-     1706, 1709, 1709, 1709, 2963, 1708, 1714, 1728, 1710, 1720,
-     2856, 1728, 1729, 1727, 1717, 1728, 1735, 1732, 1730, 1754,
-     1736, 1746, 1738, 1758, 2963, 1760, 2963, 1750, 2963, 1744,
-     1751, 1768, 1754, 2963, 1764, 1774, 1767, 1768, 2855, 1763,
-     1762, 1772, 2854, 1774, 1787, 1780, 1771, 1790, 1792, 2853,
-     1797, 1783, 1799, 1785, 1798, 1807, 1804, 1818, 1815, 1818,
-     1808, 1809, 1811, 1813, 2852, 1805, 1818, 1830, 1832, 1833,
-     1829, 1826,  190, 2889, 2877, 1822, 1841, 2849, 2848, 2847,
-     2963, 1831, 1839, 1843, 1840, 1838, 1842, 1837, 1858, 1856,
-
-     1862, 1871, 2963, 1860, 1869, 1867, 1876, 1876, 1867, 2846,
-     1861, 1871, 1886, 1869, 1877, 1886, 1886, 1887, 2845, 1891,
-     1891, 2963, 1884, 1897, 2963, 1901, 1886, 2844, 1888, 1899,
-     2963, 2963, 1910, 1894, 1895, 2963, 2963, 1905, 1914, 1907,
-     1905, 1926, 1931, 1927, 2843, 1922, 1925, 1923, 1942, 2842,
-     2841, 1939, 2840, 1936, 2963, 1937, 1943, 1947, 2963, 2963,
-     2963, 1947, 1935, 1932, 1953, 1937, 1957, 1950, 1952, 1962,
-     1965, 1956, 1971, 1975, 1964, 1964, 1967, 1968, 1979, 1974,
-     1975, 1979, 1981, 1978, 1983, 1984, 1990, 1998, 2963, 1990,
-     1993, 2877, 2876, 2864, 2863, 1987, 1990, 2008, 2011, 1996,
-
-     2963, 2006, 2004, 2008, 2016, 2020, 2015, 2025, 2025, 2034,
-     2020, 2033, 2026, 2031, 2029, 2039, 2036, 2050, 2049, 2044,
-     2053, 2963, 2053, 2041, 2832, 2039, 2049, 2828, 2827, 2052,
-     2045, 2048, 2963, 2058, 2056, 2963, 2069, 2073, 2963, 2069,
-     2086, 2086, 2963, 2077, 2074, 2081, 2091, 2083, 2825, 2084,
-     2823, 2084, 2084, 2088, 2088, 2089, 2105, 2097, 2963, 2111,
-     2105, 2094, 2113, 2822, 2107, 2963, 2963, 2123, 2963, 2963,
-     2118, 2125, 2120, 2821, 2819, 2130, 2818, 2117, 2137, 2138,
-     2139, 2141, 2138, 2139, 2145, 2132, 2141, 2150, 2150, 2137,
-     2146, 2150, 2140, 2164, 2817, 2963, 2151, 2158, 2963, 2160,
-
-     2167, 2161, 2164, 2173, 2162, 2811, 2172, 2176, 2185, 2176,
-     2188, 2179, 2963, 2808, 2963, 2187, 2191, 2182, 2188, 2201,
-     2187, 2191, 1636, 2963, 2208, 2963, 2214, 2203, 2963, 2217,
-     2216, 2202, 2219, 2221, 2211, 2218, 2216, 2221, 2241, 2218,
-     2226, 2236, 2963, 2242, 2963, 2245, 2240, 2254, 2963, 1390,
-     2245, 2240, 2247, 2257, 2260, 2264, 2257, 2257, 2259, 2260,
-     2273, 2257, 2258, 2262, 2266, 2273, 2271, 2272, 2290, 2273,
-     2963, 2281, 2283, 2286, 2290, 2297, 2299, 2300, 2306, 2292,
-     2963, 1386, 2294, 2295, 2963, 2963, 2305, 2302, 2308, 2963,
-     2963, 2320, 2306, 2324, 2963, 2319, 2313, 1239,  861, 2315,
-
-     2325, 2329, 2963, 2337, 2325, 2330, 2340, 2335, 2348, 2348,
-     2963, 2963, 2963,  853, 2342, 2355, 2351, 2346,  822, 2348,
-     2345, 2353, 2963, 2963, 2354, 2358, 2368, 2371, 2372, 2963,
-     2963, 2377, 2371, 2376,  815, 2377, 2381,  811,  810,  809,
-      462, 2379, 2383,  455, 2963, 2391, 2389, 2379, 2963, 2383,
-     2379, 2381, 2387, 2403,  445, 2409, 2408, 2963, 2399, 2963,
-     2402, 2399,  393, 2403, 2404, 2403, 2403, 2424, 2408, 2418,
-     2419, 2426,  380, 2428, 2963, 2431, 2419, 2963, 2419, 2430,
-     2963, 2442, 2963, 2445, 2447, 2430, 2437, 2441, 2452, 2435,
-     2963, 2963, 2446, 2448, 2448, 2464, 2451, 2460, 2459, 2461,
-
-     2462, 2466, 2963,  287, 2477, 2963, 2963, 2481, 2482,  273,
-     2963, 2466, 2474, 2471, 2483,  249, 2476, 2963,  266, 2496,
-     2488, 2486, 2963, 2487, 2492, 2495, 2506, 2509, 2519, 2507,
-     2516, 2963, 2520, 2509, 2517, 2512, 2530, 2530, 2963, 2525,
-     2534, 2515,  200, 2537, 2523, 2536, 2536, 2538, 2545, 2540,
-     2542, 2545, 2546, 2547, 2551, 2963, 2963, 2552,  310, 2547,
-     2569, 2556, 2575, 2575, 2570, 2963, 2559, 2576, 2963, 2963,
-     2570, 2565, 2963,  145, 2575, 2575, 2574, 2575,  124, 2584,
-     2577, 2963, 2586, 2580, 2595, 2592,  109, 2602,  107, 2963,
-     2595, 2601, 2599, 2611, 2605, 2607, 2610, 2616, 2614, 2615,
-
-     2627, 2963, 2963, 2619, 2616, 2631, 2624, 2624, 2640, 2627,
-     2963, 2633, 2963, 2636, 2636, 2646, 2647, 2963, 2634, 2645,
-     2963, 2646, 2963, 2963, 2643, 2658, 2658, 2662, 2665, 2666,
-     2669, 2963, 2651, 2657, 2658, 2659, 2666, 2672, 2669, 2670,
-     2670, 2675, 2683, 2686, 2696, 2701, 2699, 2696, 2701, 2689,
-     2690, 2703, 2696, 2713, 2963, 2712, 2710, 2714, 2963, 2963,
-     2963, 2963, 2963, 2963, 2963, 2716, 2723, 2711, 2963, 2731,
-      100, 2732, 2725, 2963, 2720, 2738, 2729, 2732, 2963, 2963,
-     2733, 2963, 2729, 2739, 2748, 2743, 2753, 2963, 2757, 2741,
-     2757, 2749, 2761, 2757, 2750, 2763, 2963, 2759, 2767, 2772,
-
-     2963, 2774, 2776, 2777,   95, 2775, 2772, 2778, 2779, 2963,
-     2775, 2784, 2794, 2963, 2963, 2781, 2796, 2802, 2786, 2963,
-     2805, 2796, 2963, 2807, 2963, 2963,   93, 2798, 2800, 2796,
-     2963, 2963, 2796, 2799, 2804, 2963, 2817, 2815, 2963, 2817,
-     2811, 2828, 2963, 2963, 2963,  105, 2875,   97,   84,   81
+     1105, 1104, 2876, 1125, 1118, 1104, 1131, 1135, 1122, 2875,
+     1126, 2949, 1125, 2949, 1134, 1138, 1129, 1143, 1151, 1154,
+     1153, 2949, 1142, 1141, 1161, 1161, 1173, 2874, 2949, 1177,
+     2873, 2949, 1183, 1172, 1176, 2872, 1167, 1184, 2949, 1176,
+
+     1169, 1176, 1177, 1189, 1184, 1186, 1192, 1184, 1195, 1203,
+     1196, 2900, 1196, 1199, 2949, 2949, 1214, 2870, 1207, 2949,
+     1220, 1214, 1217, 1223, 1219, 1229, 1229, 1233, 1225, 1224,
+     1226, 1231, 1243, 1235, 1239, 1232, 2869, 2949, 1253, 2868,
+     1241, 1248, 1259, 2867, 1246, 2866, 1262, 2865, 1278, 1261,
+     2864, 1282, 1273, 2949, 1278, 1268, 1284, 1291, 1295, 1293,
+     2949, 2949, 2949, 1295, 1286, 1300, 1293, 1288, 1300, 1303,
+     1305, 1296, 1296, 1297, 2949, 1298, 1314, 1301, 1312, 1312,
+     1329, 1333, 1337, 1328, 1332, 1341, 1329, 1330, 1345, 2863,
+     1335, 1349, 1340, 1340, 1354, 1343, 1356, 2949, 1341, 1345,
+
+     1353, 1343, 1353, 2949, 1356, 1367, 2949, 1371, 1354, 1377,
+     1361, 1379, 1389, 1373, 1392, 1388, 1389, 1382, 2949, 1390,
+     1392, 1391, 1388, 1392, 1400, 2862, 1392, 1429, 1402, 2861,
+     1401, 2860, 1408, 2949, 2949, 1420, 1421, 1407, 2949, 1423,
+     1435, 1435, 2949, 2949, 1431, 1442, 1432, 1430, 1448, 1455,
+     1443, 1454, 1450, 1445, 1441, 2949, 1443, 2949, 1458, 2859,
+     1448, 2858, 2857, 2856, 1465, 1464, 1467, 1465, 2855, 2949,
+     1460, 1468, 1479, 1488, 1483, 2949, 1478, 1493, 1485, 1482,
+     1486, 1491, 1502, 1493, 1495, 1510, 1507, 1489, 1509, 1497,
+     1512, 1513, 1503, 1510, 1525, 1531, 1520, 1534, 1525, 1540,
+
+     1539, 1544, 1543, 2854, 2949, 1527, 2949, 2949, 1547, 1534,
+     2853, 1553, 1535, 2852, 2851, 1551, 1542, 1541, 1539, 1553,
+     1554, 1548, 1553, 1561, 1567, 1557, 1563, 1569, 1570, 1569,
+     1570, 1588, 2949, 1570, 1591, 1578, 1589, 2949, 1583, 1595,
+     1592, 1588, 1599, 1594, 1598, 1597, 1593, 1610, 1614, 1604,
+     1599, 2850, 2849, 2848, 2847, 2846, 1617, 1619, 2845, 1621,
+     2844, 2949, 2949, 1621, 2949, 2949, 1623, 2843,   90, 1631,
+     1620, 1630, 1629, 2949, 2949, 1639, 1640, 1638, 1642, 1637,
+     1654, 1647, 1657, 1652, 1646, 1660, 1657, 2949, 1651, 1660,
+     1656, 1675, 1673, 1665, 1663, 1675, 1681, 1678, 1694, 1674,
+
+     1682, 2949, 1683, 1699, 1693, 1690, 1691, 1707, 1702, 1704,
+     1704, 1701, 2949, 1699, 1706, 1720, 1706, 1715, 2842, 1723,
+     1724, 1722, 1713, 1721, 1725, 1724, 1721, 1748, 1732, 1744,
+     1735, 1745, 2949, 1753, 2949, 1747, 2949, 1739, 1747, 1764,
+     1749, 2949, 1759, 1766, 1758, 2841, 1754, 1753, 1766, 2840,
+     1768, 1781, 1774, 1765, 1782, 1781, 2839, 1785, 1772, 1789,
+     1780, 1794, 1799, 1791, 1805, 1807, 1812, 1802, 1803, 1805,
+     1807, 2838, 1799, 1809, 1820, 1822, 1824, 1820, 1820,  190,
+     2875, 2863, 1816, 1835, 2835, 2834, 2833, 2949, 1825, 1833,
+     1835, 1829, 1826, 1831, 1827, 1853, 1852, 1854, 1858, 2949,
+
+     1847, 1861, 1861, 1870, 1870, 1861, 2832, 1855, 1865, 1877,
+     1859, 1867, 1877, 1877, 1881, 2831, 1885, 1885, 2949, 1878,
+     1891, 2949, 1893, 1875, 2830, 1876, 1888, 2949, 2949, 1905,
+     1884, 1891, 2949, 2949, 1897, 1901, 1894, 1897, 1919, 1925,
+     1921, 2829, 1916, 1919, 1914, 1932, 2828, 2827, 1929, 2826,
+     1927, 2949, 1932, 1940, 2949, 2949, 2949, 1940, 1928, 1925,
+     1943, 1925, 1944, 1935, 1940, 1951, 1958, 1947, 1957, 1961,
+     1950, 1954, 1960, 1961, 1971, 1966, 1968, 1969, 1970, 1967,
+     1972, 1974, 1979, 1991, 2949, 1983, 1986, 2863, 2862, 2850,
+     2849, 1980, 1980, 1996, 1998, 1981, 2949, 1994, 1993, 2001,
+
+     2007, 2006, 2001, 2011, 2015, 2027, 2013, 2025, 2018, 2024,
+     2019, 2028, 2025, 2039, 2039, 2033, 2046, 2949, 2046, 2034,
+     2821, 2032, 2039, 2817, 2816, 2040, 2032, 2033, 2949, 2046,
+     2045, 2949, 2062, 2064, 2949, 2055, 2072, 2072, 2949, 2067,
+     2067, 2074, 2083, 2075, 2815, 2077, 2811, 2074, 2073, 2077,
+     2077, 2079, 2094, 2949, 2103, 2097, 2086, 2102, 2805, 2093,
+     2949, 2949, 2109, 2949, 2949, 2102, 2109, 2107, 2804, 2803,
+     2117, 2802, 2105, 2122, 2123, 2124, 2125, 2127, 2131, 2136,
+     2122, 2132, 2139, 2138, 2125, 2134, 2138, 2128, 2152, 2799,
+     2949, 2143, 2150, 2949, 2152, 2156, 2147, 2150, 2157, 2146,
+
+     2793, 2159, 2163, 2173, 2161, 2173, 2164, 2949, 2792, 2949,
+     2171, 2175, 2175, 2181, 2193, 2180, 2181, 1390, 2949, 2197,
+     2949, 2202, 2191, 2949, 2205, 2204, 2194, 2211, 2210, 2197,
+     2204, 2200, 2205, 2223, 2205, 2212, 2230, 2949, 2227, 2949,
+     2223, 2237, 2949, 1386, 2233, 2230, 2236, 2246, 2249, 2252,
+     2244, 2244, 2245, 2247, 2260, 2248, 2249, 2250, 2251, 2257,
+     2254, 2255, 2273, 2258, 2949, 2265, 2265, 2268, 2274, 2281,
+     2282, 2283, 2294, 2282, 2949, 1384, 2283, 2284, 2949, 2949,
+     2294, 2290, 2295, 2949, 2949, 2307, 2292, 2311, 2949, 2306,
+     2304, 1240,  861, 2306, 2313, 2314, 2949, 2321, 2308, 2313,
+
+     2323, 2320, 2332, 2330, 2949, 2949, 2949,  853, 2324, 2339,
+     2335, 2329,  822, 2331, 2333, 2343, 2949, 2343, 2347, 2357,
+     2359, 2359, 2949, 2949, 2364, 2357, 2363,  815, 2364, 2372,
+      811,  810,  809,  462, 2370, 2371,  455, 2949, 2376, 2373,
+     2362, 2949, 2366, 2362, 2366, 2371, 2385,  445, 2391, 2392,
+     2949, 2383, 2949, 2385, 2382,  393, 2391, 2394, 2392, 2392,
+     2413, 2396, 2405, 2406, 2412,  380, 2415, 2949, 2418, 2410,
+     2949, 2410, 2418, 2949, 2427, 2949, 2429, 2430, 2413, 2420,
+     2426, 2436, 2417, 2949, 2949, 2428, 2432, 2432, 2447, 2434,
+     2448, 2449, 2450, 2451, 2455, 2949,  287, 2465, 2949, 2949,
+
+     2468, 2469,  273, 2949, 2452, 2461, 2463, 2469,  249, 2463,
+     2949,  266, 2481, 2472, 2469, 2949, 2470, 2475, 2480, 2490,
+     2491, 2501, 2493, 2500, 2949, 2502, 2491, 2509, 2501, 2519,
+     2519, 2949, 2513, 2521, 2502,  200, 2523, 2510, 2523, 2527,
+     2529, 2533, 2525, 2526, 2528, 2529, 2530, 2536, 2949, 2949,
+     2536,  310, 2529, 2551, 2540, 2559, 2558, 2553, 2949, 2547,
+     2566, 2949, 2949, 2559, 2554, 2949,  145, 2564, 2563, 2561,
+     2562,  124, 2570, 2564, 2949, 2573, 2571, 2586, 2580,  109,
+     2587,  107, 2949, 2579, 2584, 2582, 2594, 2590, 2591, 2592,
+     2598, 2598, 2599, 2610, 2949, 2949, 2602, 2604, 2621, 2613,
+
+     2613, 2629, 2615, 2949, 2620, 2949, 2623, 2622, 2633, 2634,
+     2949, 2625, 2636, 2949, 2634, 2949, 2949, 2628, 2642, 2641,
+     2645, 2648, 2651, 2653, 2949, 2633, 2639, 2642, 2643, 2649,
+     2655, 2657, 2660, 2659, 2664, 2672, 2674, 2683, 2688, 2685,
+     2683, 2688, 2680, 2681, 2691, 2681, 2697, 2949, 2695, 2693,
+     2697, 2949, 2949, 2949, 2949, 2949, 2949, 2949, 2701, 2707,
+     2693, 2949, 2713,  100, 2716, 2709, 2949, 2703, 2721, 2717,
+     2722, 2949, 2949, 2722, 2949, 2718, 2728, 2736, 2730, 2740,
+     2949, 2743, 2728, 2744, 2740, 2752, 2745, 2735, 2747, 2949,
+     2742, 2750, 2755, 2949, 2759, 2760, 2759,   95, 2757, 2756,
+
+     2762, 2762, 2949, 2758, 2772, 2784, 2949, 2949, 2770, 2785,
+     2791, 2774, 2949, 2792, 2783, 2949, 2793, 2949, 2949,   93,
+     2785, 2787, 2787, 2949, 2949, 2787, 2787, 2789, 2949, 2801,
+     2798, 2949, 2800, 2794, 2813, 2949, 2949, 2949,  105, 2860,
+       97,   84,   81
     } ;
 
-static yyconst flex_int16_t yy_def[1551] =
+static yyconst flex_int16_t yy_def[1544] =
     {   0,
-     1545,    1, 1545, 1545, 1545, 1546, 1547, 1548, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1546, 1547, 1545,
-     1548, 1545, 1545, 1545, 1548, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1549, 1550, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1549, 1549, 1550, 1550, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545,    0, 1545, 1545, 1545, 1545, 1545
+     1538,    1, 1538, 1538, 1538, 1539, 1540, 1541, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1539, 1540, 1538,
+     1541, 1538, 1538, 1538, 1541, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1542, 1543, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1542, 1542, 1543,
+     1543, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538,    0, 1538, 1538,
+     1538, 1538, 1538
     } ;
 
-static yyconst flex_int16_t yy_nxt[3032] =
+static yyconst flex_int16_t yy_nxt[3018] =
     {   0,
         4,    5,    6,    7,    8,    4,    9,   10,   11,   11,
        11,   11,   11,    4,    4,   12,   13,   14,   15,   16,
@@ -948,34 +947,34 @@ static yyconst flex_int16_t yy_nxt[3032] =
        20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
        30,   31,   32,   33,   34,   35,   36,    4,   40,   40,
        42,   44,   53,   45,   46,   46,   46,   46,   46,   66,
-       83,  994,   54,  102,  992,   67,   68,   43,   40,   40,
-       61,  883,  106,  884,   62,   74,   69,   41,   63,   53,
+       83,  990,   54,  102,  988,   67,   68,   43,   40,   40,
+       61,  880,  106,  881,   62,   74,   69,   41,   63,   53,
 
-       70,   64,   75,  885,   65,   38,   66,   83,   71,   54,
+       70,   64,   75,  882,   65,   38,   66,   83,   71,   54,
       102,   72,   67,   68,   43,   47,   48,   61,   49,  106,
        73,   62,   74,   69,   50,   63,   51,   70,   64,   75,
-       80,   65,   76,   52, 1533,   71, 1518,   81,   72,   82,
-       77, 1491,   47,   48,  107,   49,   78,   73, 1428,  126,
-     1426,   50,   79,   51,  129,  304,  305,   80,  108,   76,
-       52,   55,  130,   56,   81, 1419,   82,   77,   57,   58,
+       80,   65,   76,   52, 1526,   71, 1511,   81,   72,   82,
+       77, 1484,   47,   48,  107,   49,   78,   73, 1421,  126,
+     1419,   50,   79,   51,  129,  304,  305,   80,  108,   76,
+       52,   55,  130,   56,   81, 1412,   82,   77,   57,   58,
        84,  107,   59,   78,   88,   60,  126,   85,   89,   79,
-       86,  129,   87,  127,   90,  108, 1414,  128,   55,  130,
-       56,  883,  103,  884,  131,   57,   58,   84,  132,   59,
+       86,  129,   87,  127,   90,  108, 1407,  128,   55,  130,
+       56,  880,  103,  881,  131,   57,   58,   84,  132,   59,
 
-      104,   88,   60,  885,   85,   89,  105,   86,  133,   87,
+      104,   88,   60,  882,   85,   89,  105,   86,  133,   87,
       127,   90,   91,   92,  128,  134,   93,  123,  124,  103,
        94,  131,  135,  125,  136,  132,   95,  104,   46,   46,
        46,   46,   46,  105,  137,  133,  138,  139,  142,   91,
-       92, 1388,  134,   93,  123,  124,  140,   94,  141,  135,
+       92, 1381,  134,   93,  123,  124,  140,   94,  141,  135,
       125,  136,  143,   95,   96,  144,   97,  145,   98,  147,
       148,  137,   99,  138,  139,  142,  154,  156,  100,  157,
-      158,  159,  160,  140,  101,  141,  164,  146, 1366,  143,
+      158,  159,  160,  140,  101,  141,  164,  146, 1359,  143,
       155,   96,  144,   97,  145,   98,  147,  148,  165,   99,
-     1364,  166,  167,  154,  156,  100,  157,  158,  159,  160,
+     1357,  166,  167,  154,  156,  100,  157,  158,  159,  160,
 
       172,  101,  109,  164,  146,  110,  111,  155,  112,  161,
-      173,  162,  113,  114, 1358,  165,  115,  116,  166,  167,
-      168, 1402, 1403,  174,  170,  175,  163,  172, 1354,  109,
+      173,  162,  113,  114, 1351,  165,  115,  116,  166,  167,
+      168, 1395, 1396,  174,  170,  175,  163,  172, 1347,  109,
       171,  169,  110,  111,  176,  112,  161,  173,  162,  113,
       114,  149,  150,  115,  116,  117,  151,  168,  118,  119,
       174,  170,  175,  163,  152,  120,  121,  171,  169,  153,
@@ -986,16 +985,16 @@ static yyconst flex_int16_t yy_nxt[3032] =
 
       194,  185,  197,  198,  192,  195,  186,  190,  201,  199,
       203,  187,  191,  204,  208,  193,  205,  209,  220,  229,
-      210, 1330,  188,  196,  200,  230,  189,  194,  211,  197,
-      198,  227,  206,  207, 1320,  201,  199,  203,  233,  221,
+      210, 1323,  188,  196,  200,  230,  189,  194,  211,  197,
+      198,  227,  206,  207, 1313,  201,  199,  203,  233,  221,
       204,  208,  234,  205,  209,  220,  229,  210,  225,  235,
       222,  200,  230,  228,  223,  211,  224,  236,  227,  206,
       207,  212,  226,  213,  214,  233,  221,  215,  216,  234,
       217,  237,  231,  218,  238,  225,  235,  222,  240,  219,
-      228,  223,  232,  224,  236,  241, 1314,  248,  212,  226,
-      213,  214,  249,  252,  215,  216, 1305,  217,  237,  231,
+      228,  223,  232,  224,  236,  241, 1307,  248,  212,  226,
+      213,  214,  249,  252,  215,  216, 1298,  217,  237,  231,
 
-      218,  238,  250, 1302,  253,  240,  219,  254,  251,  232,
+      218,  238,  250, 1295,  253,  240,  219,  254,  251,  232,
       255,  256,  241,  242,  248,  257,  243,  258,  259,  249,
       252,  260,  262,  244,  245,  263,  264,  266,  261,  250,
       246,  253,  267,  268,  254,  251,  247,  255,  256,  269,
@@ -1033,13 +1032,13 @@ static yyconst flex_int16_t yy_nxt[3032] =
       403,  405,  406,  407,  408,  409,  417,  410,  419,  411,
       421,  423,  424,  425,  426,  412,  413,  428,  414,  430,
       418,  420,  431,  415,  416,  432,  434,  435,  436,  437,
-     1301, 1300, 1299,  417,  447,  419, 1296,  421,  423,  424,
-      425,  426,  448, 1284,  428,  449,  430,  418,  450,  431,
+     1294, 1293, 1292,  417,  447,  419, 1289,  421,  423,  424,
+      425,  426,  448, 1277,  428,  449,  430,  418,  450,  431,
       451,  452,  432,  434,  435,  436,  437,  438,  439,  440,
       453,  447,  455,  441,  457,  442,  458,  459,  443,  448,
-      444,  460,  449,  461, 1279,  450,  445,  451,  452,  446,
+      444,  460,  449,  461, 1272,  450,  445,  451,  452,  446,
 
-      467,  469, 1268,  462,  438,  439,  440,  453,  470,  455,
+      467,  469, 1261,  462,  438,  439,  440,  453,  470,  455,
       441,  457,  442,  458,  459,  443,  471,  444,  460,  472,
       461,  463,  473,  445,  474,  464,  446,  467,  469,  465,
       462,  475,  476,  477,  480,  470,  481,  482,  487,  488,
@@ -1066,217 +1065,215 @@ static yyconst flex_int16_t yy_nxt[3032] =
       569,  566,  570,  573,  583,  567,  574,  571,  575,  576,
       577,  578,  587,  579,  580,  588,  589,  590,  591,  572,
       593,  597,  581,  584,  582,  585,  586,  594,  595,  598,
-      603,  583,  600,  596,  605,  606,  608,  609,  607,  587,
-      599,  610,  588,  589,  590,  591,  611,  593,  597,  601,
-      612,  615,  602,  616,  594,  595,  598,  603,  617,  600,
-      596,  605,  606,  608,  609,  607,  613,  599,  610,  614,
-      618,  619,  620,  611,  622,  627,  601,  612,  615,  602,
-
-      616,  628,  624,  630,  631,  617,  625,  632,  633,  626,
-      634,  635,  636,  613,  637,  638,  614,  618,  619,  620,
-      639,  622,  627,  640,  641,  642,  643,  645,  628,  624,
-      630,  631,  646,  625,  632,  633,  626,  634,  635,  636,
-      647,  637,  638,  649,  650,  651,  652,  639,  653,  655,
-      640,  641,  642,  643,  645,  656,  657,  658,  659,  646,
-      660,  661,  662,  663,  664,  665,  654,  647,  666,  668,
-      649,  650,  651,  652,  670,  653,  655,  671,  677,  679,
-     1267,  683,  656,  657,  658,  659,  681,  660,  661,  662,
-      663,  664,  665,  672,  673,  666,  668,  682,  685,  686,
-
-      687,  670,  674,  688,  671,  677,  679,  675,  683,  689,
-      690,  691,  692,  681,  693,  694,  695,  696,  697,  698,
-      672,  673,  699,  700,  682,  685,  686,  687,  701,  674,
-      688,  702,  703,  704,  675,  705,  689,  690,  691,  692,
-      706,  693,  694,  695,  696,  697,  698,  707,  708,  699,
+      602,  583,  600,  596,  604,  605,  607,  608,  606,  587,
+      599,  609,  588,  589,  590,  591,  610,  593,  597,  601,
+      611,  614,  615,  616,  594,  595,  598,  602,  617,  600,
+      596,  604,  605,  607,  608,  606,  612,  599,  609,  613,
+      618,  619,  621,  610,  626,  627,  601,  611,  614,  615,
+
+      616,  629,  623,  630,  631,  617,  624,  632,  633,  625,
+      634,  635,  636,  612,  637,  638,  613,  618,  619,  621,
+      639,  626,  627,  640,  641,  642,  644,  645,  629,  623,
+      630,  631,  646,  624,  632,  633,  625,  634,  635,  636,
+      648,  637,  638,  649,  650,  651,  652,  639,  654,  655,
+      640,  641,  642,  644,  645,  656,  657,  658,  659,  646,
+      660,  661,  662,  663,  653,  664,  665,  648,  667,  669,
+      649,  650,  651,  652,  670,  654,  655,  671,  672,  676,
+      678, 1260,  656,  657,  658,  659,  673,  660,  661,  662,
+      663,  674,  664,  665,  682,  667,  669,  680,  684,  685,
+
+      686,  670,  687,  688,  671,  672,  676,  678,  681,  689,
+      690,  691,  692,  673,  693,  694,  695,  696,  674,  697,
+      698,  682,  699,  700,  680,  684,  685,  686,  701,  687,
+      688,  702,  703,  704,  705,  681,  689,  690,  691,  692,
+      706,  693,  694,  695,  696,  707,  697,  698,  708,  699,
       700,  709,  710,  711,  712,  701,  713,  714,  702,  703,
-      704,  715,  705,  716,  717,  719,  720,  706,  721,  722,
-      723,  724,  725,  726,  707,  708,  727,  728,  709,  710,
-      711,  712,  729,  713,  714,  730,  731,  732,  715,  733,
-      716,  717,  719,  720,  734,  721,  722,  723,  724,  725,
-
-      726,  735,  736,  727,  728,  737,  738,  739,  740,  729,
-      741,  744,  730,  731,  732,  745,  733,  742,  743,  746,
-      747,  734,  748,  749,  750,  751,  753, 1256,  735,  736,
-      759, 1226,  737,  738,  739,  740,  761,  741,  744,  763,
-      764,  765,  745,  766,  742,  743,  746,  747,  767,  748,
-      749,  750,  751,  753,  754,  768,  769,  759,  755,  770,
-      756,  771,  772,  761,  757,  758,  763,  764,  765,  773,
-      766,  774,  775,  776,  777,  767,  778,  779,  780,  781,
-      782,  754,  768,  769,  784,  755,  770,  756,  771,  772,
-      788,  757,  758,  789,  790,  791,  773,  793,  774,  775,
-
-      776,  777,  794,  778,  779,  780,  781,  782,  796,  797,
-      798,  784,  795,  799,  800,  801,  802,  788,  803,  804,
-      789,  790,  791,  805,  793,  806,  807,  808,  809,  794,
-      810,  811,  812,  813,  814,  796,  797,  798,  815,  795,
-      799,  800,  801,  802,  816,  803,  804,  817,  818,  819,
-      805,  820,  806,  807,  808,  809,  821,  810,  811,  812,
-      813,  814,  822,  823,  824,  815,  825,  827,  828,  829,
-      831,  816,  832,  835,  817,  818,  819,  836,  820,  837,
-      838,  839,  840,  821,  841,  842,  843,  844,  845,  822,
-      823,  824,  846,  825,  827,  828,  829,  831,  847,  832,
-
-      835,  848,  849,  850,  836,  851,  837,  838,  839,  840,
-      852,  841,  842,  843,  844,  845,  853,  854,  855,  846,
-      856,  857,  858,  859,  860,  847,  861,  862,  848,  849,
-      850,  863,  851,  864,  865,  866,  867,  852,  868,  869,
-      875,  876,  878,  853,  854,  855,  880,  856,  857,  858,
-      859,  860,  881,  861,  862,  886,  887,  888,  863,  889,
-      864,  865,  866,  867,  890,  868,  869,  875,  876,  878,
-      891,  892,  893,  880,  894,  895,  897, 1204,  901,  881,
-      902,  903,  886,  887,  888,  904,  889,  898,  896,  905,
-      906,  890,  899,  907,  908,  909,  910,  891,  892,  893,
-
-      911,  894,  895,  897,  900,  901,  912,  902,  903,  913,
-      914,  915,  904,  916,  898,  896,  905,  906,  917,  899,
-      907,  908,  909,  910,  918,  919,  920,  911,  921,  922,
-      923,  900,  924,  912,  925,  926,  913,  914,  915,  927,
-      916,  928,  929,  930,  931,  917,  932,  934,  935,  936,
-      937,  918,  919,  920,  938,  921,  922,  923,  939,  924,
-      940,  925,  926,  941,  944,  945,  927,  946,  928,  929,
-      930,  931,  942,  932,  934,  935,  936,  937,  947,  948,
-      949,  938,  943,  950,  951,  939,  952,  940,  953,  954,
-      941,  944,  945,  955,  946,  956,  957,  959,  960,  942,
-
-      961,  963,  964,  965,  966,  947,  948,  949,  967,  943,
-      950,  951,  968,  952,  970,  953,  954,  971,  972,  973,
-      955,  974,  956,  957,  959,  960,  975,  961,  963,  964,
-      965,  966,  976,  977,  978,  967,  979,  980,  981,  968,
-      982,  970,  983,  985,  971,  972,  973,  986,  974,  987,
-      988,  989,  990,  975,  991,  996,  997, 1001, 1002,  976,
-      977,  978, 1003,  979,  980,  981, 1004,  982, 1005,  983,
-      985, 1006, 1007, 1008,  986, 1009,  987,  988,  989,  990,
-     1010,  991,  996,  997, 1001, 1002, 1011, 1012, 1013, 1003,
-     1014, 1015, 1016, 1004, 1017, 1005, 1019, 1020, 1006, 1007,
-
-     1008, 1021, 1009, 1022, 1023, 1024, 1025, 1010, 1026, 1028,
-     1029, 1030, 1031, 1011, 1012, 1013, 1032, 1014, 1015, 1016,
-     1033, 1017, 1035, 1019, 1020, 1036, 1039, 1037, 1021, 1040,
-     1022, 1023, 1024, 1025, 1041, 1026, 1028, 1029, 1030, 1031,
-     1042, 1043, 1044, 1032, 1038, 1045, 1046, 1033, 1047, 1035,
-     1049, 1050, 1036, 1039, 1037, 1051, 1040, 1052, 1055, 1057,
-     1058, 1041, 1059, 1060, 1061, 1062, 1063, 1042, 1043, 1044,
-     1064, 1038, 1045, 1046, 1065, 1047, 1066, 1049, 1050, 1067,
-     1068, 1069, 1051, 1070, 1052, 1055, 1057, 1058, 1071, 1059,
-     1060, 1061, 1062, 1063, 1072, 1073, 1074, 1064, 1075, 1076,
-
-     1077, 1065, 1078, 1066, 1079, 1080, 1067, 1068, 1069, 1081,
-     1070, 1082, 1083, 1084, 1085, 1071, 1086, 1087, 1088, 1089,
-     1090, 1072, 1073, 1074, 1091, 1075, 1076, 1077, 1092, 1078,
-     1093, 1079, 1080, 1094, 1095, 1096, 1081, 1097, 1082, 1083,
-     1084, 1085, 1098, 1086, 1087, 1088, 1089, 1090, 1099, 1100,
-     1101, 1091, 1102, 1103, 1104, 1092, 1105, 1093, 1106, 1107,
-     1094, 1095, 1096, 1108, 1097, 1109, 1110, 1111, 1112, 1098,
-     1113, 1114, 1115, 1116, 1118, 1099, 1100, 1101, 1119, 1102,
-     1103, 1104, 1122, 1105, 1123, 1106, 1107, 1124, 1125, 1126,
-     1108, 1127, 1109, 1110, 1111, 1112, 1128, 1113, 1114, 1115,
-
-     1116, 1118, 1129, 1130, 1131, 1119, 1132, 1133, 1134, 1122,
-     1135, 1123, 1136, 1138, 1124, 1125, 1126, 1140, 1127, 1141,
-     1142, 1143, 1144, 1128, 1145, 1146, 1147, 1148, 1149, 1129,
-     1130, 1131, 1150, 1132, 1133, 1134, 1152, 1135, 1153, 1136,
-     1138, 1154, 1155, 1156, 1140, 1159, 1141, 1142, 1143, 1144,
-     1161, 1145, 1146, 1147, 1148, 1149, 1162, 1163, 1164, 1150,
-     1165, 1166, 1167, 1152, 1168, 1153, 1169, 1170, 1154, 1155,
-     1156, 1171, 1159, 1172, 1173, 1174, 1175, 1161, 1176, 1177,
-     1179, 1180, 1181, 1162, 1163, 1164, 1182, 1165, 1166, 1167,
-     1183, 1168, 1184, 1169, 1170, 1185, 1186, 1188, 1171, 1189,
-
-     1172, 1173, 1174, 1175, 1190, 1176, 1177, 1179, 1180, 1181,
-     1191, 1192, 1193, 1182, 1197, 1198, 1199, 1183, 1200, 1184,
-     1195, 1202, 1185, 1186, 1188, 1203, 1189, 1205, 1196, 1206,
-     1207, 1190, 1208, 1209, 1210, 1201, 1211, 1191, 1192, 1193,
-     1212, 1197, 1198, 1199, 1213, 1200, 1214, 1195, 1202, 1215,
-     1216, 1219, 1203, 1220, 1205, 1221, 1206, 1207, 1217, 1208,
-     1209, 1210, 1201, 1211, 1218, 1222, 1223, 1212, 1224, 1225,
-     1227, 1213, 1228, 1214, 1229, 1230, 1215, 1216, 1219, 1231,
-     1220, 1232, 1221, 1233, 1234, 1217, 1235, 1236, 1237, 1238,
-     1239, 1218, 1222, 1223, 1240, 1224, 1225, 1227, 1241, 1228,
-
-     1242, 1229, 1230, 1243, 1244, 1245, 1231, 1246, 1232, 1247,
-     1233, 1234, 1248, 1235, 1236, 1237, 1238, 1239, 1249, 1250,
-     1251, 1240, 1252, 1253, 1254, 1241, 1255, 1242, 1257, 1258,
-     1243, 1244, 1245, 1259, 1246, 1260, 1247, 1261, 1262, 1248,
-     1263, 1264, 1265, 1266, 1269, 1249, 1250, 1251, 1270, 1252,
-     1253, 1254, 1271, 1255, 1272, 1257, 1258, 1273, 1274, 1275,
-     1259, 1276, 1260, 1277, 1261, 1262, 1278, 1263, 1264, 1265,
-     1266, 1269, 1280, 1281, 1282, 1270, 1283, 1285, 1286, 1271,
-     1287, 1272, 1288, 1289, 1273, 1274, 1275, 1290, 1276, 1291,
-     1277, 1292, 1293, 1278, 1294, 1295, 1297, 1298, 1303, 1280,
-
-     1281, 1282, 1304, 1283, 1285, 1286, 1306, 1287, 1307, 1288,
-     1289, 1308, 1309, 1310, 1290, 1311, 1291, 1312, 1292, 1293,
-     1313, 1294, 1295, 1297, 1298, 1303, 1315, 1316, 1317, 1304,
-     1318, 1319, 1321, 1306, 1322, 1307, 1323, 1324, 1308, 1309,
-     1310, 1325, 1311, 1326, 1312, 1327, 1328, 1313, 1329, 1331,
-     1332, 1333, 1334, 1315, 1316, 1317, 1335, 1318, 1319, 1321,
-     1336, 1322, 1337, 1323, 1324, 1338, 1339, 1340, 1325, 1341,
-     1326, 1342, 1327, 1328, 1343, 1329, 1331, 1332, 1333, 1334,
-     1344, 1345, 1346, 1335, 1347, 1348, 1349, 1336, 1350, 1337,
-     1351, 1352, 1338, 1339, 1340, 1353, 1341, 1355, 1342, 1356,
-
-     1357, 1343, 1359, 1360, 1361, 1363, 1362, 1344, 1345, 1346,
-     1365, 1347, 1348, 1349, 1367, 1350, 1368, 1351, 1352, 1369,
-     1370, 1371, 1353, 1372, 1355, 1373, 1356, 1357, 1374, 1359,
-     1360, 1361, 1363, 1362, 1375, 1378, 1376, 1365, 1379, 1380,
-     1381, 1367, 1377, 1368, 1382, 1383, 1369, 1370, 1371, 1384,
-     1372, 1385, 1373, 1386, 1387, 1374, 1389, 1390, 1391, 1392,
-     1393, 1375, 1378, 1376, 1394, 1379, 1380, 1381, 1395, 1377,
-     1396, 1382, 1383, 1397, 1398, 1399, 1384, 1400, 1385, 1401,
-     1386, 1387, 1404, 1389, 1390, 1391, 1392, 1393, 1405, 1406,
-     1407, 1394, 1408, 1409, 1410, 1395, 1411, 1396, 1412, 1413,
-
-     1397, 1398, 1399, 1415, 1400, 1416, 1401, 1417, 1418, 1404,
-     1420, 1421, 1422, 1423, 1424, 1405, 1406, 1407, 1425, 1408,
-     1409, 1410, 1427, 1411, 1429, 1412, 1413, 1430, 1431, 1432,
-     1415, 1433, 1416, 1434, 1417, 1418, 1435, 1420, 1421, 1422,
-     1423, 1424, 1436, 1437, 1438, 1425, 1439, 1440, 1441, 1427,
-     1442, 1429, 1443, 1444, 1430, 1431, 1432, 1445, 1433, 1446,
-     1434, 1447, 1448, 1435, 1449, 1450, 1451, 1452, 1453, 1436,
-     1437, 1438, 1454, 1439, 1440, 1441, 1455, 1442, 1456, 1443,
-     1444, 1457, 1458, 1459, 1445, 1460, 1446, 1461, 1447, 1448,
-     1462, 1449, 1450, 1451, 1452, 1453, 1463, 1464, 1465, 1454,
-
-     1466, 1467, 1468, 1455, 1469, 1456, 1470, 1471, 1457, 1458,
-     1459, 1472, 1460, 1473, 1461, 1474, 1475, 1462, 1476, 1477,
-     1478, 1479, 1480, 1463, 1464, 1465, 1481, 1466, 1467, 1468,
-     1482, 1469, 1483, 1470, 1471, 1484, 1485, 1486, 1472, 1487,
-     1473, 1488, 1474, 1475, 1489, 1476, 1477, 1478, 1479, 1480,
-     1490, 1492, 1493, 1481, 1494, 1495, 1496, 1482, 1497, 1483,
-     1498, 1499, 1484, 1485, 1486, 1500, 1487, 1501, 1488, 1502,
-     1503, 1489, 1504, 1505, 1506, 1507, 1508, 1490, 1492, 1493,
-     1509, 1494, 1495, 1496, 1510, 1497, 1511, 1498, 1499, 1512,
-     1513, 1514, 1500, 1515, 1501, 1516, 1502, 1503, 1517, 1504,
-
-     1505, 1506, 1507, 1508, 1519, 1520, 1521, 1509, 1522, 1523,
-     1524, 1510, 1525, 1511, 1526, 1527, 1512, 1513, 1514, 1528,
-     1515, 1529, 1516, 1530, 1531, 1517, 1532, 1534, 1535, 1536,
-     1537, 1519, 1520, 1521, 1538, 1522, 1523, 1524, 1539, 1525,
-     1540, 1526, 1527, 1541, 1542, 1543, 1528, 1544, 1529, 1194,
-     1530, 1531, 1187, 1532, 1534, 1535, 1536, 1537, 1178, 1160,
-     1158, 1538, 1157, 1151, 1139, 1539, 1137, 1540, 1121, 1120,
-     1541, 1542, 1543, 1117, 1544,   39,   39,  995,  995,  993,
-      993, 1056, 1054, 1053, 1048, 1034, 1027, 1018, 1000,  999,
-      998,  995,  993,  984,  969,  962,  958,  933,  882,  879,
-
-      877,  874,  873,  872,  871,  870,  834,  833,  830,  826,
-      792,  787,  786,  785,  783,  762,  760,  752,  718,  684,
-      680,  678,  676,  669,  667,  648,  644,  629,  623,  621,
-      604,  592,  560,  558,  557,  543,  526,  514,  500,  499,
-      492,  479,  468,  466,  456,  454,  433,  429,  427,  422,
-      404,  395,  388,  350,  317,  301,  265,  239,  202,   37,
-       37, 1545,    3, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545
+      704,  705,  715,  716,  718,  719,  720,  706,  721,  722,
+      723,  724,  707,  725,  726,  708,  727,  728,  709,  710,
+      711,  712,  729,  713,  714,  730,  731,  732,  733,  715,
+      716,  718,  719,  720,  734,  721,  722,  723,  724,  735,
+
+      725,  726,  736,  727,  728,  737,  738,  739,  742,  729,
+      740,  741,  730,  731,  732,  733,  743,  744,  745,  746,
+      747,  734,  748,  749,  751, 1249,  735, 1219,  757,  736,
+      759, 1198,  737,  738,  739,  742,  761,  740,  741,  762,
+      763,  764,  765,  743,  744,  745,  746,  747,  752,  748,
+      749,  751,  753,  766,  754,  757,  767,  759,  755,  756,
+      768,  769,  770,  761,  771,  772,  762,  763,  764,  765,
+      773,  774,  775,  776,  777,  752,  778,  779,  780,  753,
+      766,  754,  782,  767,  786,  755,  756,  768,  769,  770,
+      787,  771,  772,  788,  789,  791,  792,  773,  774,  775,
+
+      776,  777,  794,  778,  779,  780,  793,  795,  796,  782,
+      797,  786,  798,  799,  800,  801,  802,  787,  803,  804,
+      788,  789,  791,  792,  805,  806,  807,  808,  809,  794,
+      810,  811,  812,  793,  795,  796,  813,  797,  814,  798,
+      799,  800,  801,  802,  815,  803,  804,  816,  817,  818,
+      819,  805,  806,  807,  808,  809,  820,  810,  811,  812,
+      821,  822,  823,  813,  825,  814,  826,  827,  829,  830,
+      833,  815,  834,  835,  816,  817,  818,  819,  836,  837,
+      838,  839,  840,  820,  841,  842,  843,  821,  822,  823,
+      844,  825,  845,  826,  827,  829,  830,  833,  846,  834,
+
+      835,  847,  848,  849,  850,  836,  837,  838,  839,  840,
+      851,  841,  842,  843,  852,  853,  854,  844,  855,  845,
+      856,  857,  858,  859,  860,  846,  861,  862,  847,  848,
+      849,  850,  863,  864,  865,  866,  872,  851,  873,  875,
+      877,  852,  853,  854,  878,  855,  883,  856,  857,  858,
+      859,  860,  884,  861,  862,  885,  886,  887,  888,  863,
+      864,  865,  866,  872,  889,  873,  875,  877,  890,  891,
+      894,  878,  895,  883,  892,  898,  899,  896,  900,  884,
+      901,  902,  885,  886,  887,  888,  903,  893,  904,  897,
+      905,  889,  906,  907,  908,  890,  891,  894,  909,  895,
+
+      910,  892,  898,  899,  896,  900,  911,  901,  902,  912,
+      913,  914,  915,  903,  893,  904,  897,  905,  916,  906,
+      907,  908,  917,  918,  919,  909,  920,  910,  921,  922,
+      923,  924,  925,  911,  926,  927,  912,  913,  914,  915,
+      928,  929,  931,  932,  933,  916,  934,  935,  936,  917,
+      918,  919,  937,  920,  938,  921,  922,  923,  924,  925,
+      941,  926,  927,  942,  943,  944,  939,  928,  929,  931,
+      932,  933,  945,  934,  935,  936,  940,  946,  947,  937,
+      948,  938,  949,  950,  951,  952,  953,  941,  955,  956,
+      942,  943,  944,  939,  957,  959,  960,  961,  962,  945,
+
+      963,  964,  966,  940,  946,  947,  967,  948,  968,  949,
+      950,  951,  952,  953,  969,  955,  956,  970,  971,  972,
+      973,  957,  959,  960,  961,  962,  974,  963,  964,  966,
+      975,  976,  977,  967,  978,  968,  979,  981,  982,  983,
+      984,  969,  985,  986,  970,  971,  972,  973,  987,  992,
+      993,  997,  998,  974,  999, 1000, 1001,  975,  976,  977,
+     1002,  978, 1003,  979,  981,  982,  983,  984, 1004,  985,
+      986, 1005, 1006, 1007, 1008,  987,  992,  993,  997,  998,
+     1009,  999, 1000, 1001, 1010, 1011, 1012, 1002, 1013, 1003,
+     1015, 1016, 1017, 1018, 1019, 1004, 1020, 1021, 1005, 1006,
+
+     1007, 1008, 1022, 1024, 1025, 1026, 1027, 1009, 1028, 1029,
+     1031, 1010, 1011, 1012, 1032, 1013, 1035, 1015, 1016, 1017,
+     1018, 1019, 1033, 1020, 1021, 1036, 1037, 1038, 1039, 1022,
+     1024, 1025, 1026, 1027, 1040, 1028, 1029, 1031, 1041, 1034,
+     1042, 1032, 1043, 1035, 1045, 1046, 1047, 1048, 1051, 1033,
+     1053, 1054, 1036, 1037, 1038, 1039, 1055, 1056, 1057, 1058,
+     1059, 1040, 1060, 1061, 1062, 1041, 1034, 1042, 1063, 1043,
+     1064, 1045, 1046, 1047, 1048, 1051, 1065, 1053, 1054, 1066,
+     1067, 1068, 1069, 1055, 1056, 1057, 1058, 1059, 1070, 1060,
+     1061, 1062, 1071, 1072, 1073, 1063, 1074, 1064, 1075, 1076,
+
+     1077, 1078, 1079, 1065, 1080, 1081, 1066, 1067, 1068, 1069,
+     1082, 1083, 1084, 1085, 1086, 1070, 1087, 1088, 1089, 1071,
+     1072, 1073, 1090, 1074, 1091, 1075, 1076, 1077, 1078, 1079,
+     1092, 1080, 1081, 1093, 1094, 1095, 1096, 1082, 1083, 1084,
+     1085, 1086, 1097, 1087, 1088, 1089, 1098, 1099, 1100, 1090,
+     1101, 1091, 1102, 1103, 1104, 1105, 1106, 1092, 1107, 1108,
+     1093, 1094, 1095, 1096, 1109, 1110, 1111, 1113, 1114, 1097,
+     1117, 1118, 1119, 1098, 1099, 1100, 1120, 1101, 1121, 1102,
+     1103, 1104, 1105, 1106, 1122, 1107, 1108, 1123, 1124, 1125,
+     1126, 1109, 1110, 1111, 1113, 1114, 1127, 1117, 1118, 1119,
+
+     1128, 1129, 1130, 1120, 1131, 1121, 1133, 1135, 1136, 1137,
+     1138, 1122, 1139, 1140, 1123, 1124, 1125, 1126, 1141, 1142,
+     1143, 1144, 1146, 1127, 1147, 1148, 1149, 1128, 1129, 1130,
+     1150, 1131, 1153, 1133, 1135, 1136, 1137, 1138, 1155, 1139,
+     1140, 1156, 1157, 1158, 1159, 1141, 1142, 1143, 1144, 1146,
+     1160, 1147, 1148, 1149, 1161, 1162, 1163, 1150, 1164, 1153,
+     1165, 1166, 1167, 1168, 1169, 1155, 1170, 1171, 1156, 1157,
+     1158, 1159, 1173, 1174, 1175, 1176, 1177, 1160, 1178, 1179,
+     1180, 1161, 1162, 1163, 1182, 1164, 1183, 1165, 1166, 1167,
+     1168, 1169, 1184, 1170, 1171, 1185, 1186, 1187, 1191, 1173,
+
+     1174, 1175, 1176, 1177, 1189, 1178, 1179, 1180, 1192, 1193,
+     1194, 1182, 1190, 1183, 1196, 1197, 1199, 1200, 1201, 1184,
+     1202, 1203, 1185, 1186, 1187, 1191, 1204, 1195, 1205, 1206,
+     1207, 1189, 1208, 1209, 1210, 1192, 1193, 1194, 1213, 1214,
+     1211, 1196, 1197, 1199, 1200, 1201, 1212, 1202, 1203, 1215,
+     1216, 1217, 1218, 1204, 1195, 1205, 1206, 1207, 1220, 1208,
+     1209, 1210, 1221, 1222, 1223, 1213, 1214, 1211, 1224, 1225,
+     1226, 1227, 1228, 1212, 1229, 1230, 1215, 1216, 1217, 1218,
+     1231, 1232, 1233, 1234, 1235, 1220, 1236, 1237, 1238, 1221,
+     1222, 1223, 1239, 1240, 1241, 1224, 1225, 1226, 1227, 1228,
+
+     1242, 1229, 1230, 1243, 1244, 1245, 1246, 1231, 1232, 1233,
+     1234, 1235, 1247, 1236, 1237, 1238, 1248, 1250, 1251, 1239,
+     1240, 1241, 1252, 1253, 1254, 1255, 1256, 1242, 1257, 1258,
+     1243, 1244, 1245, 1246, 1259, 1262, 1263, 1264, 1265, 1247,
+     1266, 1267, 1268, 1248, 1250, 1251, 1269, 1270, 1271, 1252,
+     1253, 1254, 1255, 1256, 1273, 1257, 1258, 1274, 1275, 1276,
+     1278, 1259, 1262, 1263, 1264, 1265, 1279, 1266, 1267, 1268,
+     1280, 1281, 1282, 1269, 1270, 1271, 1283, 1284, 1285, 1286,
+     1287, 1273, 1288, 1290, 1274, 1275, 1276, 1278, 1291, 1296,
+     1297, 1299, 1300, 1279, 1301, 1302, 1303, 1280, 1281, 1282,
+
+     1304, 1305, 1306, 1283, 1284, 1285, 1286, 1287, 1308, 1288,
+     1290, 1309, 1310, 1311, 1312, 1291, 1296, 1297, 1299, 1300,
+     1314, 1301, 1302, 1303, 1315, 1316, 1317, 1304, 1305, 1306,
+     1318, 1319, 1320, 1321, 1322, 1308, 1324, 1325, 1309, 1310,
+     1311, 1312, 1326, 1327, 1328, 1329, 1330, 1314, 1331, 1332,
+     1333, 1315, 1316, 1317, 1334, 1335, 1336, 1318, 1319, 1320,
+     1321, 1322, 1337, 1324, 1325, 1338, 1339, 1340, 1341, 1326,
+     1327, 1328, 1329, 1330, 1342, 1331, 1332, 1333, 1343, 1344,
+     1345, 1334, 1335, 1336, 1346, 1348, 1349, 1350, 1352, 1337,
+     1353, 1356, 1338, 1339, 1340, 1341, 1354, 1358, 1355, 1360,
+
+     1361, 1342, 1362, 1363, 1364, 1343, 1344, 1345, 1365, 1366,
+     1367, 1346, 1348, 1349, 1350, 1352, 1368, 1353, 1356, 1371,
+     1372, 1373, 1369, 1354, 1358, 1355, 1360, 1361, 1370, 1362,
+     1363, 1364, 1374, 1375, 1376, 1365, 1366, 1367, 1377, 1378,
+     1379, 1380, 1382, 1368, 1383, 1384, 1371, 1372, 1373, 1369,
+     1385, 1386, 1387, 1388, 1389, 1370, 1390, 1391, 1392, 1374,
+     1375, 1376, 1393, 1394, 1397, 1377, 1378, 1379, 1380, 1382,
+     1398, 1383, 1384, 1399, 1400, 1401, 1402, 1385, 1386, 1387,
+     1388, 1389, 1403, 1390, 1391, 1392, 1404, 1405, 1406, 1393,
+     1394, 1397, 1408, 1409, 1410, 1411, 1413, 1398, 1414, 1415,
+
+     1399, 1400, 1401, 1402, 1416, 1417, 1418, 1420, 1422, 1403,
+     1423, 1424, 1425, 1404, 1405, 1406, 1426, 1427, 1428, 1408,
+     1409, 1410, 1411, 1413, 1429, 1414, 1415, 1430, 1431, 1432,
+     1433, 1416, 1417, 1418, 1420, 1422, 1434, 1423, 1424, 1425,
+     1435, 1436, 1437, 1426, 1427, 1428, 1438, 1439, 1440, 1441,
+     1442, 1429, 1443, 1444, 1430, 1431, 1432, 1433, 1445, 1446,
+     1447, 1448, 1449, 1434, 1450, 1451, 1452, 1435, 1436, 1437,
+     1453, 1454, 1455, 1438, 1439, 1440, 1441, 1442, 1456, 1443,
+     1444, 1457, 1458, 1459, 1460, 1445, 1446, 1447, 1448, 1449,
+     1461, 1450, 1451, 1452, 1462, 1463, 1464, 1453, 1454, 1455,
+
+     1465, 1466, 1467, 1468, 1469, 1456, 1470, 1471, 1457, 1458,
+     1459, 1460, 1472, 1473, 1474, 1475, 1476, 1461, 1477, 1478,
+     1479, 1462, 1463, 1464, 1480, 1481, 1482, 1465, 1466, 1467,
+     1468, 1469, 1483, 1470, 1471, 1485, 1486, 1487, 1488, 1472,
+     1473, 1474, 1475, 1476, 1489, 1477, 1478, 1479, 1490, 1491,
+     1492, 1480, 1481, 1482, 1493, 1494, 1495, 1496, 1497, 1483,
+     1498, 1499, 1485, 1486, 1487, 1488, 1500, 1501, 1502, 1503,
+     1504, 1489, 1505, 1506, 1507, 1490, 1491, 1492, 1508, 1509,
+     1510, 1493, 1494, 1495, 1496, 1497, 1512, 1498, 1499, 1513,
+     1514, 1515, 1516, 1500, 1501, 1502, 1503, 1504, 1517, 1505,
+
+     1506, 1507, 1518, 1519, 1520, 1508, 1509, 1510, 1521, 1522,
+     1523, 1524, 1525, 1512, 1527, 1528, 1513, 1514, 1515, 1516,
+     1529, 1530, 1531, 1532, 1533, 1517, 1534, 1535, 1536, 1518,
+     1519, 1520, 1537, 1188, 1181, 1521, 1522, 1523, 1524, 1525,
+     1172, 1527, 1528, 1154, 1152, 1151, 1145, 1529, 1530, 1531,
+     1532, 1533, 1134, 1534, 1535, 1536, 1132, 1116, 1115, 1537,
+       39,   39, 1112,  991,  991,  989,  989, 1052, 1050, 1049,
+     1044, 1030, 1023, 1014,  996,  995,  994,  991,  989,  980,
+      965,  958,  954,  930,  879,  876,  874,  871,  870,  869,
+      868,  867,  832,  831,  828,  824,  790,  785,  784,  783,
+
+      781,  760,  758,  750,  717,  683,  679,  677,  675,  668,
+      666,  647,  643,  628,  622,  620,  603,  592,  560,  558,
+      557,  543,  526,  514,  500,  499,  492,  479,  468,  466,
+      456,  454,  433,  429,  427,  422,  404,  395,  388,  350,
+      317,  301,  265,  239,  202,   37,   37, 1538,    3, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538
     } ;
 
-static yyconst flex_int16_t yy_chk[3032] =
+static yyconst flex_int16_t yy_chk[3018] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1286,34 +1283,34 @@ static yyconst flex_int16_t yy_chk[3032] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    7,    7,
         9,   10,   13,   10,   11,   11,   11,   11,   11,   16,
-       21, 1550,   13,   26, 1549,   16,   16,    9,   39,   39,
-       15,  771,   28,  771,   15,   18,   16, 1548,   15,   13,
+       21, 1543,   13,   26, 1542,   16,   16,    9,   39,   39,
+       15,  769,   28,  769,   15,   18,   16, 1541,   15,   13,
 
-       17,   15,   18,  771,   15, 1546,   16,   21,   17,   13,
+       17,   15,   18,  769,   15, 1539,   16,   21,   17,   13,
        26,   17,   16,   16,    9,   12,   12,   15,   12,   28,
        17,   15,   18,   16,   12,   15,   12,   17,   15,   18,
-       20,   15,   19,   12, 1527,   17, 1505,   20,   17,   20,
-       19, 1471,   12,   12,   29,   12,   19,   17, 1389,   33,
-     1387,   12,   19,   12,   35,  179,  179,   20,   29,   19,
-       12,   14,   36,   14,   20, 1379,   20,   19,   14,   14,
+       20,   15,   19,   12, 1520,   17, 1498,   20,   17,   20,
+       19, 1464,   12,   12,   29,   12,   19,   17, 1382,   33,
+     1380,   12,   19,   12,   35,  179,  179,   20,   29,   19,
+       12,   14,   36,   14,   20, 1372,   20,   19,   14,   14,
        22,   29,   14,   19,   23,   14,   33,   22,   23,   19,
-       22,   35,   22,   34,   23,   29, 1374,   34,   14,   36,
-       14,  883,   27,  883,   43,   14,   14,   22,   47,   14,
+       22,   35,   22,   34,   23,   29, 1367,   34,   14,   36,
+       14,  880,   27,  880,   43,   14,   14,   22,   47,   14,
 
-       27,   23,   14,  883,   22,   23,   27,   22,   48,   22,
+       27,   23,   14,  880,   22,   23,   27,   22,   48,   22,
        34,   23,   24,   24,   34,   49,   24,   32,   32,   27,
        24,   43,   50,   32,   51,   47,   24,   27,   46,   46,
        46,   46,   46,   27,   52,   48,   53,   54,   56,   24,
-       24, 1343,   49,   24,   32,   32,   55,   24,   55,   50,
+       24, 1336,   49,   24,   32,   32,   55,   24,   55,   50,
        32,   51,   57,   24,   25,   58,   25,   59,   25,   60,
        61,   52,   25,   53,   54,   56,   63,   64,   25,   65,
-       66,   67,   68,   55,   25,   55,   70,   59, 1319,   57,
+       66,   67,   68,   55,   25,   55,   70,   59, 1312,   57,
        63,   25,   58,   25,   59,   25,   60,   61,   71,   25,
-     1316,   72,   73,   63,   64,   25,   65,   66,   67,   68,
+     1309,   72,   73,   63,   64,   25,   65,   66,   67,   68,
 
        76,   25,   30,   70,   59,   30,   30,   63,   30,   69,
-       77,   69,   30,   30, 1310,   71,   30,   30,   72,   73,
-       74, 1359, 1359,   78,   75,   78,   69,   76, 1304,   30,
+       77,   69,   30,   30, 1303,   71,   30,   30,   72,   73,
+       74, 1352, 1352,   78,   75,   78,   69,   76, 1297,   30,
        75,   74,   30,   30,   79,   30,   69,   77,   69,   30,
        30,   62,   62,   30,   30,   31,   62,   74,   31,   31,
        78,   75,   78,   69,   62,   31,   31,   75,   74,   62,
@@ -1324,16 +1321,16 @@ static yyconst flex_int16_t yy_chk[3032] =
 
        93,   88,   96,   97,   92,   94,   89,   91,   99,   98,
       101,   89,   91,  102,  104,   93,  103,  105,  108,  112,
-      106, 1273,   90,   95,   98,  113,   90,   93,  106,   96,
-       97,  111,  103,  103, 1263,   99,   98,  101,  115,  109,
+      106, 1266,   90,   95,   98,  113,   90,   93,  106,   96,
+       97,  111,  103,  103, 1256,   99,   98,  101,  115,  109,
       102,  104,  116,  103,  105,  108,  112,  106,  110,  117,
       109,   98,  113,  111,  109,  106,  109,  118,  111,  103,
       103,  107,  110,  107,  107,  115,  109,  107,  107,  116,
       107,  119,  114,  107,  120,  110,  117,  109,  122,  107,
-      111,  109,  114,  109,  118,  123, 1255,  125,  107,  110,
-      107,  107,  126,  128,  107,  107, 1244,  107,  119,  114,
+      111,  109,  114,  109,  118,  123, 1248,  125,  107,  110,
+      107,  107,  126,  128,  107,  107, 1237,  107,  119,  114,
 
-      107,  120,  127, 1241,  129,  122,  107,  130,  127,  114,
+      107,  120,  127, 1234,  129,  122,  107,  130,  127,  114,
       131,  132,  123,  124,  125,  133,  124,  134,  136,  126,
       128,  137,  138,  124,  124,  139,  140,  142,  137,  127,
       124,  129,  143,  144,  130,  127,  124,  131,  132,  145,
@@ -1371,13 +1368,13 @@ static yyconst flex_int16_t yy_chk[3032] =
       279,  281,  282,  283,  284,  285,  295,  286,  296,  287,
       297,  300,  301,  302,  303,  289,  290,  307,  292,  309,
       295,  296,  310,  293,  294,  311,  313,  314,  315,  316,
-     1240, 1239, 1238,  295,  318,  296, 1235,  297,  300,  301,
-      302,  303,  319, 1219,  307,  320,  309,  295,  321,  310,
+     1233, 1232, 1231,  295,  318,  296, 1228,  297,  300,  301,
+      302,  303,  319, 1213,  307,  320,  309,  295,  321,  310,
       322,  323,  311,  313,  314,  315,  316,  317,  317,  317,
       325,  318,  327,  317,  329,  317,  330,  331,  317,  319,
-      317,  332,  320,  333, 1214,  321,  317,  322,  323,  317,
+      317,  332,  320,  333, 1208,  321,  317,  322,  323,  317,
 
-      336,  340, 1199,  334,  317,  317,  317,  325,  341,  327,
+      336,  340, 1193,  334,  317,  317,  317,  325,  341,  327,
       317,  329,  317,  330,  331,  317,  342,  317,  332,  343,
       333,  334,  344,  317,  345,  334,  317,  336,  340,  334,
       334,  346,  347,  348,  350,  341,  351,  352,  354,  355,
@@ -1406,212 +1403,210 @@ static yyconst flex_int16_t yy_chk[3032] =
       464,  466,  453,  455,  454,  456,  457,  465,  465,  467,
       469,  454,  468,  465,  471,  473,  475,  476,  473,  458,
       467,  477,  459,  460,  461,  462,  478,  464,  466,  468,
-      479,  481,  468,  483,  465,  465,  467,  469,  484,  468,
+      479,  481,  483,  484,  465,  465,  467,  469,  485,  468,
       465,  471,  473,  475,  476,  473,  480,  467,  477,  480,
-      485,  486,  487,  478,  490,  494,  468,  479,  481,  468,
-
-      483,  495,  493,  497,  498,  484,  493,  500,  501,  493,
-      502,  503,  504,  480,  505,  506,  480,  485,  486,  487,
-      507,  490,  494,  508,  509,  510,  511,  513,  495,  493,
-      497,  498,  514,  493,  500,  501,  493,  502,  503,  504,
-      517,  505,  506,  519,  521,  522,  523,  507,  524,  525,
-      508,  509,  510,  511,  513,  526,  527,  528,  529,  514,
-      530,  531,  532,  533,  534,  535,  524,  517,  536,  539,
-      519,  521,  522,  523,  541,  524,  525,  542,  545,  547,
-     1198,  550,  526,  527,  528,  529,  549,  530,  531,  532,
-      533,  534,  535,  543,  543,  536,  539,  549,  552,  553,
-
-      555,  541,  543,  556,  542,  545,  547,  543,  550,  557,
-      558,  559,  560,  549,  564,  565,  566,  567,  568,  569,
-      543,  543,  570,  571,  549,  552,  553,  555,  572,  543,
-      556,  573,  574,  576,  543,  577,  557,  558,  559,  560,
-      578,  564,  565,  566,  567,  568,  569,  579,  580,  570,
-      571,  581,  582,  583,  584,  572,  585,  586,  573,  574,
-      576,  587,  577,  588,  589,  591,  592,  578,  593,  594,
-      595,  596,  597,  599,  579,  580,  600,  601,  581,  582,
-      583,  584,  602,  585,  586,  603,  604,  606,  587,  607,
-      588,  589,  591,  592,  609,  593,  594,  595,  596,  597,
-
-      599,  610,  611,  600,  601,  612,  613,  614,  615,  602,
-      616,  618,  603,  604,  606,  619,  607,  617,  617,  621,
-      622,  609,  623,  624,  625,  626,  628, 1182,  610,  611,
-      630, 1150,  612,  613,  614,  615,  632,  616,  618,  634,
-      637,  638,  619,  639,  617,  617,  621,  622,  641,  623,
-      624,  625,  626,  628,  629,  642,  643,  630,  629,  646,
-      629,  647,  648,  632,  629,  629,  634,  637,  638,  649,
-      639,  650,  651,  652,  653,  641,  654,  655,  656,  658,
-      660,  629,  642,  643,  662,  629,  646,  629,  647,  648,
-      666,  629,  629,  667,  668,  669,  649,  672,  650,  651,
-
-      652,  653,  673,  654,  655,  656,  658,  660,  674,  675,
-      676,  662,  673,  678,  679,  680,  681,  666,  682,  683,
-      667,  668,  669,  684,  672,  685,  686,  687,  688,  673,
-      689,  690,  691,  692,  693,  674,  675,  676,  694,  673,
-      678,  679,  680,  681,  695,  682,  683,  696,  697,  698,
-      684,  699,  685,  686,  687,  688,  700,  689,  690,  691,
-      692,  693,  701,  702,  703,  694,  704,  707,  710,  711,
-      713,  695,  714,  717,  696,  697,  698,  718,  699,  719,
-      720,  721,  722,  700,  723,  724,  725,  726,  727,  701,
-      702,  703,  728,  704,  707,  710,  711,  713,  729,  714,
-
-      717,  730,  731,  732,  718,  733,  719,  720,  721,  722,
-      734,  723,  724,  725,  726,  727,  736,  737,  738,  728,
-      739,  741,  742,  743,  744,  729,  745,  746,  730,  731,
-      732,  747,  733,  748,  749,  750,  751,  734,  752,  753,
-      759,  760,  762,  736,  737,  738,  766,  739,  741,  742,
-      743,  744,  769,  745,  746,  772,  773,  774,  747,  775,
-      748,  749,  750,  751,  778,  752,  753,  759,  760,  762,
-      779,  780,  781,  766,  782,  783,  784, 1123,  786,  769,
-      787,  788,  772,  773,  774,  789,  775,  785,  783,  791,
-      792,  778,  785,  793,  794,  795,  796,  779,  780,  781,
-
-      797,  782,  783,  784,  785,  786,  798,  787,  788,  799,
-      800,  801,  789,  802,  785,  783,  791,  792,  803,  785,
-      793,  794,  795,  796,  805,  806,  807,  797,  808,  809,
-      810,  785,  811,  798,  812,  813,  799,  800,  801,  814,
-      802,  816,  817,  818,  819,  803,  820,  822,  823,  824,
-      825,  805,  806,  807,  826,  808,  809,  810,  827,  811,
-      828,  812,  813,  829,  831,  832,  814,  833,  816,  817,
-      818,  819,  830,  820,  822,  823,  824,  825,  834,  836,
-      838,  826,  830,  840,  841,  827,  842,  828,  843,  845,
-      829,  831,  832,  846,  833,  847,  848,  850,  851,  830,
-
-      852,  854,  855,  856,  857,  834,  836,  838,  858,  830,
-      840,  841,  859,  842,  861,  843,  845,  862,  863,  864,
-      846,  865,  847,  848,  850,  851,  866,  852,  854,  855,
-      856,  857,  867,  868,  869,  858,  870,  871,  872,  859,
-      873,  861,  874,  876,  862,  863,  864,  877,  865,  878,
-      879,  880,  881,  866,  882,  886,  887,  892,  893,  867,
-      868,  869,  894,  870,  871,  872,  895,  873,  896,  874,
-      876,  897,  898,  899,  877,  900,  878,  879,  880,  881,
-      901,  882,  886,  887,  892,  893,  902,  904,  905,  894,
-      906,  907,  908,  895,  909,  896,  911,  912,  897,  898,
-
-      899,  913,  900,  914,  915,  916,  917,  901,  918,  920,
-      921,  923,  924,  902,  904,  905,  926,  906,  907,  908,
-      927,  909,  929,  911,  912,  930,  934,  933,  913,  935,
-      914,  915,  916,  917,  938,  918,  920,  921,  923,  924,
-      939,  940,  941,  926,  933,  942,  943,  927,  944,  929,
-      946,  947,  930,  934,  933,  948,  935,  949,  952,  954,
-      956,  938,  957,  958,  962,  963,  964,  939,  940,  941,
-      965,  933,  942,  943,  966,  944,  967,  946,  947,  968,
-      969,  970,  948,  971,  949,  952,  954,  956,  972,  957,
-      958,  962,  963,  964,  973,  974,  975,  965,  976,  977,
-
-      978,  966,  979,  967,  980,  981,  968,  969,  970,  982,
-      971,  983,  984,  985,  986,  972,  987,  988,  990,  991,
-      996,  973,  974,  975,  997,  976,  977,  978,  998,  979,
-      999,  980,  981, 1000, 1002, 1003,  982, 1004,  983,  984,
-      985,  986, 1005,  987,  988,  990,  991,  996, 1006, 1007,
-     1008,  997, 1009, 1010, 1011,  998, 1012,  999, 1013, 1014,
-     1000, 1002, 1003, 1015, 1004, 1016, 1017, 1018, 1019, 1005,
-     1020, 1021, 1023, 1024, 1026, 1006, 1007, 1008, 1027, 1009,
-     1010, 1011, 1030, 1012, 1031, 1013, 1014, 1032, 1034, 1035,
-     1015, 1037, 1016, 1017, 1018, 1019, 1038, 1020, 1021, 1023,
-
-     1024, 1026, 1040, 1041, 1042, 1027, 1044, 1045, 1046, 1030,
-     1047, 1031, 1048, 1050, 1032, 1034, 1035, 1052, 1037, 1053,
-     1054, 1055, 1056, 1038, 1057, 1058, 1060, 1061, 1062, 1040,
-     1041, 1042, 1063, 1044, 1045, 1046, 1065, 1047, 1068, 1048,
-     1050, 1071, 1072, 1073, 1052, 1076, 1053, 1054, 1055, 1056,
-     1078, 1057, 1058, 1060, 1061, 1062, 1079, 1080, 1081, 1063,
-     1082, 1083, 1084, 1065, 1085, 1068, 1086, 1087, 1071, 1072,
-     1073, 1088, 1076, 1089, 1090, 1091, 1092, 1078, 1093, 1094,
-     1097, 1098, 1100, 1079, 1080, 1081, 1101, 1082, 1083, 1084,
-     1102, 1085, 1103, 1086, 1087, 1104, 1105, 1107, 1088, 1108,
-
-     1089, 1090, 1091, 1092, 1109, 1093, 1094, 1097, 1098, 1100,
-     1110, 1111, 1112, 1101, 1117, 1118, 1119, 1102, 1120, 1103,
-     1116, 1121, 1104, 1105, 1107, 1122, 1108, 1125, 1116, 1127,
-     1128, 1109, 1130, 1131, 1132, 1120, 1133, 1110, 1111, 1112,
-     1134, 1117, 1118, 1119, 1135, 1120, 1136, 1116, 1121, 1137,
-     1138, 1140, 1122, 1141, 1125, 1142, 1127, 1128, 1139, 1130,
-     1131, 1132, 1120, 1133, 1139, 1144, 1146, 1134, 1147, 1148,
-     1151, 1135, 1152, 1136, 1153, 1154, 1137, 1138, 1140, 1155,
-     1141, 1156, 1142, 1157, 1158, 1139, 1159, 1160, 1161, 1162,
-     1163, 1139, 1144, 1146, 1164, 1147, 1148, 1151, 1165, 1152,
-
-     1166, 1153, 1154, 1167, 1168, 1169, 1155, 1170, 1156, 1172,
-     1157, 1158, 1173, 1159, 1160, 1161, 1162, 1163, 1174, 1175,
-     1176, 1164, 1177, 1178, 1179, 1165, 1180, 1166, 1183, 1184,
-     1167, 1168, 1169, 1187, 1170, 1188, 1172, 1189, 1192, 1173,
-     1193, 1194, 1196, 1197, 1200, 1174, 1175, 1176, 1201, 1177,
-     1178, 1179, 1202, 1180, 1204, 1183, 1184, 1205, 1206, 1207,
-     1187, 1208, 1188, 1209, 1189, 1192, 1210, 1193, 1194, 1196,
-     1197, 1200, 1215, 1216, 1217, 1201, 1218, 1220, 1221, 1202,
-     1222, 1204, 1225, 1226, 1205, 1206, 1207, 1227, 1208, 1228,
-     1209, 1229, 1232, 1210, 1233, 1234, 1236, 1237, 1242, 1215,
-
-     1216, 1217, 1243, 1218, 1220, 1221, 1246, 1222, 1247, 1225,
-     1226, 1248, 1250, 1251, 1227, 1252, 1228, 1253, 1229, 1232,
-     1254, 1233, 1234, 1236, 1237, 1242, 1256, 1257, 1259, 1243,
-     1261, 1262, 1264, 1246, 1265, 1247, 1266, 1267, 1248, 1250,
-     1251, 1268, 1252, 1269, 1253, 1270, 1271, 1254, 1272, 1274,
-     1276, 1277, 1279, 1256, 1257, 1259, 1280, 1261, 1262, 1264,
-     1282, 1265, 1284, 1266, 1267, 1285, 1286, 1287, 1268, 1288,
-     1269, 1289, 1270, 1271, 1290, 1272, 1274, 1276, 1277, 1279,
-     1293, 1294, 1295, 1280, 1296, 1297, 1298, 1282, 1299, 1284,
-     1300, 1301, 1285, 1286, 1287, 1302, 1288, 1305, 1289, 1308,
-
-     1309, 1290, 1312, 1313, 1314, 1315, 1314, 1293, 1294, 1295,
-     1317, 1296, 1297, 1298, 1320, 1299, 1321, 1300, 1301, 1322,
-     1324, 1325, 1302, 1326, 1305, 1327, 1308, 1309, 1328, 1312,
-     1313, 1314, 1315, 1314, 1329, 1331, 1330, 1317, 1333, 1334,
-     1335, 1320, 1330, 1321, 1336, 1337, 1322, 1324, 1325, 1338,
-     1326, 1340, 1327, 1341, 1342, 1328, 1344, 1345, 1346, 1347,
-     1348, 1329, 1331, 1330, 1349, 1333, 1334, 1335, 1350, 1330,
-     1351, 1336, 1337, 1352, 1353, 1354, 1338, 1355, 1340, 1358,
-     1341, 1342, 1360, 1344, 1345, 1346, 1347, 1348, 1361, 1362,
-     1363, 1349, 1364, 1365, 1367, 1350, 1368, 1351, 1371, 1372,
-
-     1352, 1353, 1354, 1375, 1355, 1376, 1358, 1377, 1378, 1360,
-     1380, 1381, 1383, 1384, 1385, 1361, 1362, 1363, 1386, 1364,
-     1365, 1367, 1388, 1368, 1391, 1371, 1372, 1392, 1393, 1394,
-     1375, 1395, 1376, 1396, 1377, 1378, 1397, 1380, 1381, 1383,
-     1384, 1385, 1398, 1399, 1400, 1386, 1401, 1404, 1405, 1388,
-     1406, 1391, 1407, 1408, 1392, 1393, 1394, 1409, 1395, 1410,
-     1396, 1412, 1414, 1397, 1415, 1416, 1417, 1419, 1420, 1398,
-     1399, 1400, 1422, 1401, 1404, 1405, 1425, 1406, 1426, 1407,
-     1408, 1427, 1428, 1429, 1409, 1430, 1410, 1431, 1412, 1414,
-     1433, 1415, 1416, 1417, 1419, 1420, 1434, 1435, 1436, 1422,
-
-     1437, 1438, 1439, 1425, 1440, 1426, 1441, 1442, 1427, 1428,
-     1429, 1443, 1430, 1444, 1431, 1445, 1446, 1433, 1447, 1448,
-     1449, 1450, 1451, 1434, 1435, 1436, 1452, 1437, 1438, 1439,
-     1453, 1440, 1454, 1441, 1442, 1456, 1457, 1458, 1443, 1466,
-     1444, 1467, 1445, 1446, 1468, 1447, 1448, 1449, 1450, 1451,
-     1470, 1472, 1473, 1452, 1475, 1476, 1477, 1453, 1478, 1454,
-     1481, 1483, 1456, 1457, 1458, 1484, 1466, 1485, 1467, 1486,
-     1487, 1468, 1489, 1490, 1491, 1492, 1493, 1470, 1472, 1473,
-     1494, 1475, 1476, 1477, 1495, 1478, 1496, 1481, 1483, 1498,
-     1499, 1500, 1484, 1502, 1485, 1503, 1486, 1487, 1504, 1489,
-
-     1490, 1491, 1492, 1493, 1506, 1507, 1508, 1494, 1509, 1511,
-     1512, 1495, 1513, 1496, 1516, 1517, 1498, 1499, 1500, 1518,
-     1502, 1519, 1503, 1521, 1522, 1504, 1524, 1528, 1529, 1530,
-     1533, 1506, 1507, 1508, 1534, 1509, 1511, 1512, 1535, 1513,
-     1537, 1516, 1517, 1538, 1540, 1541, 1518, 1542, 1519, 1114,
-     1521, 1522, 1106, 1524, 1528, 1529, 1530, 1533, 1095, 1077,
-     1075, 1534, 1074, 1064, 1051, 1535, 1049, 1537, 1029, 1028,
-     1538, 1540, 1541, 1025, 1542, 1547, 1547,  995,  994,  993,
-      992,  953,  951,  950,  945,  928,  919,  910,  890,  889,
-      888,  885,  884,  875,  860,  853,  849,  821,  770,  763,
-
-      761,  758,  757,  756,  755,  754,  716,  715,  712,  705,
-      670,  665,  664,  663,  661,  633,  631,  627,  590,  551,
-      548,  546,  544,  540,  537,  518,  512,  496,  491,  488,
-      470,  463,  434,  432,  431,  416,  393,  381,  366,  365,
-      360,  349,  338,  335,  328,  326,  312,  308,  306,  298,
-      280,  268,  259,  220,  191,  176,  141,  121,  100,   37,
-        5,    3, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545,
-     1545
+      486,  487,  490,  478,  494,  495,  468,  479,  481,  483,
+
+      484,  497,  493,  498,  500,  485,  493,  501,  502,  493,
+      503,  504,  505,  480,  506,  507,  480,  486,  487,  490,
+      508,  494,  495,  509,  510,  511,  513,  514,  497,  493,
+      498,  500,  517,  493,  501,  502,  493,  503,  504,  505,
+      519,  506,  507,  521,  522,  523,  524,  508,  525,  526,
+      509,  510,  511,  513,  514,  527,  528,  529,  530,  517,
+      531,  532,  533,  534,  524,  535,  536,  519,  539,  541,
+      521,  522,  523,  524,  542,  525,  526,  543,  543,  545,
+      547, 1192,  527,  528,  529,  530,  543,  531,  532,  533,
+      534,  543,  535,  536,  550,  539,  541,  549,  552,  553,
+
+      555,  542,  556,  557,  543,  543,  545,  547,  549,  558,
+      559,  560,  564,  543,  565,  566,  567,  568,  543,  569,
+      570,  550,  571,  572,  549,  552,  553,  555,  573,  556,
+      557,  574,  576,  577,  578,  549,  558,  559,  560,  564,
+      579,  565,  566,  567,  568,  580,  569,  570,  581,  571,
+      572,  582,  583,  584,  585,  573,  586,  587,  574,  576,
+      577,  578,  588,  589,  591,  592,  593,  579,  594,  595,
+      596,  597,  580,  599,  600,  581,  601,  602,  582,  583,
+      584,  585,  603,  586,  587,  605,  606,  608,  609,  588,
+      589,  591,  592,  593,  610,  594,  595,  596,  597,  611,
+
+      599,  600,  612,  601,  602,  613,  614,  615,  617,  603,
+      616,  616,  605,  606,  608,  609,  618,  620,  621,  622,
+      623,  610,  624,  625,  627, 1176,  611, 1144,  629,  612,
+      631, 1118,  613,  614,  615,  617,  633,  616,  616,  636,
+      637,  638,  640,  618,  620,  621,  622,  623,  628,  624,
+      625,  627,  628,  641,  628,  629,  642,  631,  628,  628,
+      645,  646,  647,  633,  648,  649,  636,  637,  638,  640,
+      650,  651,  652,  653,  654,  628,  655,  657,  659,  628,
+      641,  628,  661,  642,  665,  628,  628,  645,  646,  647,
+      666,  648,  649,  667,  668,  671,  672,  650,  651,  652,
+
+      653,  654,  673,  655,  657,  659,  672,  674,  675,  661,
+      677,  665,  678,  679,  680,  681,  682,  666,  683,  684,
+      667,  668,  671,  672,  685,  686,  687,  688,  689,  673,
+      690,  691,  692,  672,  674,  675,  693,  677,  694,  678,
+      679,  680,  681,  682,  695,  683,  684,  696,  697,  698,
+      699,  685,  686,  687,  688,  689,  700,  690,  691,  692,
+      701,  702,  703,  693,  706,  694,  709,  710,  712,  713,
+      716,  695,  717,  718,  696,  697,  698,  699,  719,  720,
+      721,  722,  723,  700,  724,  725,  726,  701,  702,  703,
+      727,  706,  728,  709,  710,  712,  713,  716,  729,  717,
+
+      718,  730,  731,  732,  734,  719,  720,  721,  722,  723,
+      735,  724,  725,  726,  736,  737,  739,  727,  740,  728,
+      741,  742,  743,  744,  745,  729,  746,  747,  730,  731,
+      732,  734,  748,  749,  750,  751,  757,  735,  758,  760,
+      764,  736,  737,  739,  767,  740,  770,  741,  742,  743,
+      744,  745,  771,  746,  747,  772,  773,  776,  777,  748,
+      749,  750,  751,  757,  778,  758,  760,  764,  779,  780,
+      782,  767,  783,  770,  781,  784,  785,  783,  786,  771,
+      787,  789,  772,  773,  776,  777,  790,  781,  791,  783,
+      792,  778,  793,  794,  795,  779,  780,  782,  796,  783,
+
+      797,  781,  784,  785,  783,  786,  798,  787,  789,  799,
+      800,  801,  803,  790,  781,  791,  783,  792,  804,  793,
+      794,  795,  805,  806,  807,  796,  808,  797,  809,  810,
+      811,  812,  814,  798,  815,  816,  799,  800,  801,  803,
+      817,  818,  820,  821,  822,  804,  823,  824,  825,  805,
+      806,  807,  826,  808,  827,  809,  810,  811,  812,  814,
+      829,  815,  816,  830,  831,  832,  828,  817,  818,  820,
+      821,  822,  834,  823,  824,  825,  828,  836,  838,  826,
+      839,  827,  840,  841,  843,  844,  845,  829,  847,  848,
+      830,  831,  832,  828,  849,  851,  852,  853,  854,  834,
+
+      855,  856,  858,  828,  836,  838,  859,  839,  860,  840,
+      841,  843,  844,  845,  861,  847,  848,  862,  863,  864,
+      865,  849,  851,  852,  853,  854,  866,  855,  856,  858,
+      867,  868,  869,  859,  870,  860,  871,  873,  874,  875,
+      876,  861,  877,  878,  862,  863,  864,  865,  879,  883,
+      884,  889,  890,  866,  891,  892,  893,  867,  868,  869,
+      894,  870,  895,  871,  873,  874,  875,  876,  896,  877,
+      878,  897,  898,  899,  901,  879,  883,  884,  889,  890,
+      902,  891,  892,  893,  903,  904,  905,  894,  906,  895,
+      908,  909,  910,  911,  912,  896,  913,  914,  897,  898,
+
+      899,  901,  915,  917,  918,  920,  921,  902,  923,  924,
+      926,  903,  904,  905,  927,  906,  931,  908,  909,  910,
+      911,  912,  930,  913,  914,  932,  935,  936,  937,  915,
+      917,  918,  920,  921,  938,  923,  924,  926,  939,  930,
+      940,  927,  941,  931,  943,  944,  945,  946,  949,  930,
+      951,  953,  932,  935,  936,  937,  954,  958,  959,  960,
+      961,  938,  962,  963,  964,  939,  930,  940,  965,  941,
+      966,  943,  944,  945,  946,  949,  967,  951,  953,  968,
+      969,  970,  971,  954,  958,  959,  960,  961,  972,  962,
+      963,  964,  973,  974,  975,  965,  976,  966,  977,  978,
+
+      979,  980,  981,  967,  982,  983,  968,  969,  970,  971,
+      984,  986,  987,  992,  993,  972,  994,  995,  996,  973,
+      974,  975,  998,  976,  999,  977,  978,  979,  980,  981,
+     1000,  982,  983, 1001, 1002, 1003, 1004,  984,  986,  987,
+      992,  993, 1005,  994,  995,  996, 1006, 1007, 1008,  998,
+     1009,  999, 1010, 1011, 1012, 1013, 1014, 1000, 1015, 1016,
+     1001, 1002, 1003, 1004, 1017, 1019, 1020, 1022, 1023, 1005,
+     1026, 1027, 1028, 1006, 1007, 1008, 1030, 1009, 1031, 1010,
+     1011, 1012, 1013, 1014, 1033, 1015, 1016, 1034, 1036, 1037,
+     1038, 1017, 1019, 1020, 1022, 1023, 1040, 1026, 1027, 1028,
+
+     1041, 1042, 1043, 1030, 1044, 1031, 1046, 1048, 1049, 1050,
+     1051, 1033, 1052, 1053, 1034, 1036, 1037, 1038, 1055, 1056,
+     1057, 1058, 1060, 1040, 1063, 1066, 1067, 1041, 1042, 1043,
+     1068, 1044, 1071, 1046, 1048, 1049, 1050, 1051, 1073, 1052,
+     1053, 1074, 1075, 1076, 1077, 1055, 1056, 1057, 1058, 1060,
+     1078, 1063, 1066, 1067, 1079, 1080, 1081, 1068, 1082, 1071,
+     1083, 1084, 1085, 1086, 1087, 1073, 1088, 1089, 1074, 1075,
+     1076, 1077, 1092, 1093, 1095, 1096, 1097, 1078, 1098, 1099,
+     1100, 1079, 1080, 1081, 1102, 1082, 1103, 1083, 1084, 1085,
+     1086, 1087, 1104, 1088, 1089, 1105, 1106, 1107, 1112, 1092,
+
+     1093, 1095, 1096, 1097, 1111, 1098, 1099, 1100, 1113, 1114,
+     1115, 1102, 1111, 1103, 1116, 1117, 1120, 1122, 1123, 1104,
+     1125, 1126, 1105, 1106, 1107, 1112, 1127, 1115, 1128, 1129,
+     1130, 1111, 1131, 1132, 1133, 1113, 1114, 1115, 1135, 1136,
+     1134, 1116, 1117, 1120, 1122, 1123, 1134, 1125, 1126, 1137,
+     1139, 1141, 1142, 1127, 1115, 1128, 1129, 1130, 1145, 1131,
+     1132, 1133, 1146, 1147, 1148, 1135, 1136, 1134, 1149, 1150,
+     1151, 1152, 1153, 1134, 1154, 1155, 1137, 1139, 1141, 1142,
+     1156, 1157, 1158, 1159, 1160, 1145, 1161, 1162, 1163, 1146,
+     1147, 1148, 1164, 1166, 1167, 1149, 1150, 1151, 1152, 1153,
+
+     1168, 1154, 1155, 1169, 1170, 1171, 1172, 1156, 1157, 1158,
+     1159, 1160, 1173, 1161, 1162, 1163, 1174, 1177, 1178, 1164,
+     1166, 1167, 1181, 1182, 1183, 1186, 1187, 1168, 1188, 1190,
+     1169, 1170, 1171, 1172, 1191, 1194, 1195, 1196, 1198, 1173,
+     1199, 1200, 1201, 1174, 1177, 1178, 1202, 1203, 1204, 1181,
+     1182, 1183, 1186, 1187, 1209, 1188, 1190, 1210, 1211, 1212,
+     1214, 1191, 1194, 1195, 1196, 1198, 1215, 1199, 1200, 1201,
+     1216, 1218, 1219, 1202, 1203, 1204, 1220, 1221, 1222, 1225,
+     1226, 1209, 1227, 1229, 1210, 1211, 1212, 1214, 1230, 1235,
+     1236, 1239, 1240, 1215, 1241, 1243, 1244, 1216, 1218, 1219,
+
+     1245, 1246, 1247, 1220, 1221, 1222, 1225, 1226, 1249, 1227,
+     1229, 1250, 1252, 1254, 1255, 1230, 1235, 1236, 1239, 1240,
+     1257, 1241, 1243, 1244, 1258, 1259, 1260, 1245, 1246, 1247,
+     1261, 1262, 1263, 1264, 1265, 1249, 1267, 1269, 1250, 1252,
+     1254, 1255, 1270, 1272, 1273, 1275, 1277, 1257, 1278, 1279,
+     1280, 1258, 1259, 1260, 1281, 1282, 1283, 1261, 1262, 1263,
+     1264, 1265, 1286, 1267, 1269, 1287, 1288, 1289, 1290, 1270,
+     1272, 1273, 1275, 1277, 1291, 1278, 1279, 1280, 1292, 1293,
+     1294, 1281, 1282, 1283, 1295, 1298, 1301, 1302, 1305, 1286,
+     1306, 1308, 1287, 1288, 1289, 1290, 1307, 1310, 1307, 1313,
+
+     1314, 1291, 1315, 1317, 1318, 1292, 1293, 1294, 1319, 1320,
+     1321, 1295, 1298, 1301, 1302, 1305, 1322, 1306, 1308, 1324,
+     1326, 1327, 1323, 1307, 1310, 1307, 1313, 1314, 1323, 1315,
+     1317, 1318, 1328, 1329, 1330, 1319, 1320, 1321, 1331, 1333,
+     1334, 1335, 1337, 1322, 1338, 1339, 1324, 1326, 1327, 1323,
+     1340, 1341, 1342, 1343, 1344, 1323, 1345, 1346, 1347, 1328,
+     1329, 1330, 1348, 1351, 1353, 1331, 1333, 1334, 1335, 1337,
+     1354, 1338, 1339, 1355, 1356, 1357, 1358, 1340, 1341, 1342,
+     1343, 1344, 1360, 1345, 1346, 1347, 1361, 1364, 1365, 1348,
+     1351, 1353, 1368, 1369, 1370, 1371, 1373, 1354, 1374, 1376,
+
+     1355, 1356, 1357, 1358, 1377, 1378, 1379, 1381, 1384, 1360,
+     1385, 1386, 1387, 1361, 1364, 1365, 1388, 1389, 1390, 1368,
+     1369, 1370, 1371, 1373, 1391, 1374, 1376, 1392, 1393, 1394,
+     1397, 1377, 1378, 1379, 1381, 1384, 1398, 1385, 1386, 1387,
+     1399, 1400, 1401, 1388, 1389, 1390, 1402, 1403, 1405, 1407,
+     1408, 1391, 1409, 1410, 1392, 1393, 1394, 1397, 1412, 1413,
+     1415, 1418, 1419, 1398, 1420, 1421, 1422, 1399, 1400, 1401,
+     1423, 1424, 1426, 1402, 1403, 1405, 1407, 1408, 1427, 1409,
+     1410, 1428, 1429, 1430, 1431, 1412, 1413, 1415, 1418, 1419,
+     1432, 1420, 1421, 1422, 1433, 1434, 1435, 1423, 1424, 1426,
+
+     1436, 1437, 1438, 1439, 1440, 1427, 1441, 1442, 1428, 1429,
+     1430, 1431, 1443, 1444, 1445, 1446, 1447, 1432, 1449, 1450,
+     1451, 1433, 1434, 1435, 1459, 1460, 1461, 1436, 1437, 1438,
+     1439, 1440, 1463, 1441, 1442, 1465, 1466, 1468, 1469, 1443,
+     1444, 1445, 1446, 1447, 1470, 1449, 1450, 1451, 1471, 1474,
+     1476, 1459, 1460, 1461, 1477, 1478, 1479, 1480, 1482, 1463,
+     1483, 1484, 1465, 1466, 1468, 1469, 1485, 1486, 1487, 1488,
+     1489, 1470, 1491, 1492, 1493, 1471, 1474, 1476, 1495, 1496,
+     1497, 1477, 1478, 1479, 1480, 1482, 1499, 1483, 1484, 1500,
+     1501, 1502, 1504, 1485, 1486, 1487, 1488, 1489, 1505, 1491,
+
+     1492, 1493, 1506, 1509, 1510, 1495, 1496, 1497, 1511, 1512,
+     1514, 1515, 1517, 1499, 1521, 1522, 1500, 1501, 1502, 1504,
+     1523, 1526, 1527, 1528, 1530, 1505, 1531, 1533, 1534, 1506,
+     1509, 1510, 1535, 1109, 1101, 1511, 1512, 1514, 1515, 1517,
+     1090, 1521, 1522, 1072, 1070, 1069, 1059, 1523, 1526, 1527,
+     1528, 1530, 1047, 1531, 1533, 1534, 1045, 1025, 1024, 1535,
+     1540, 1540, 1021,  991,  990,  989,  988,  950,  948,  947,
+      942,  925,  916,  907,  887,  886,  885,  882,  881,  872,
+      857,  850,  846,  819,  768,  761,  759,  756,  755,  754,
+      753,  752,  715,  714,  711,  704,  669,  664,  663,  662,
+
+      660,  632,  630,  626,  590,  551,  548,  546,  544,  540,
+      537,  518,  512,  496,  491,  488,  470,  463,  434,  432,
+      431,  416,  393,  381,  366,  365,  360,  349,  338,  335,
+      328,  326,  312,  308,  306,  298,  280,  268,  259,  220,
+      191,  176,  141,  121,  100,   37,    5,    3, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+
+     1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1538, 1538, 1538, 1538, 1538, 1538, 1538
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1696,7 +1691,7 @@ conf_yy_fatal_error(const char *msg)
   return 0;
 }
 
-#line 1700 "conf_lexer.c"
+#line 1695 "conf_lexer.c"
 
 #define INITIAL 0
 
@@ -1878,7 +1873,7 @@ YY_DECL
     
 #line 80 "conf_lexer.l"
 
-#line 1882 "conf_lexer.c"
+#line 1877 "conf_lexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -1937,13 +1932,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 1546 )
+				if ( yy_current_state >= 1539 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 1545 );
+		while ( yy_current_state != 1538 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -2556,522 +2551,522 @@ YY_RULE_SETUP
 case 110:
 YY_RULE_SETUP
 #line 238 "conf_lexer.l"
-{ return PING_WARNING; }
+{ return PORT; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 239 "conf_lexer.l"
-{ return PORT; }
+{ return RESV; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 240 "conf_lexer.l"
-{ return RESV; }
+{ return QUIET_ON_BAN; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 241 "conf_lexer.l"
-{ return QUIET_ON_BAN; }
+{ return REASON; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 242 "conf_lexer.l"
-{ return REASON; }
+{ return T_RECVQ; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 243 "conf_lexer.l"
-{ return T_RECVQ; }
+{ return REDIRPORT; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 244 "conf_lexer.l"
-{ return REDIRPORT; }
+{ return REDIRSERV; }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 245 "conf_lexer.l"
-{ return REDIRSERV; }
+{ return REGEX_T; }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 246 "conf_lexer.l"
-{ return REGEX_T; }
+{ return REHASH; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 247 "conf_lexer.l"
-{ return REHASH; }
+{ return REMOTE; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 248 "conf_lexer.l"
-{ return REMOTE; }
+{ return REMOTEBAN; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 249 "conf_lexer.l"
-{ return REMOTEBAN; }
+{ return T_RESTART; }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 250 "conf_lexer.l"
-{ return T_RESTART; }
+{ return RESTRICT_CHANNELS; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 251 "conf_lexer.l"
-{ return RESTRICT_CHANNELS; }
+{ return RESV; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 252 "conf_lexer.l"
-{ return RESV; }
+{ return RESV_EXEMPT; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 253 "conf_lexer.l"
-{ return RESV_EXEMPT; }
+{ return RSA_PRIVATE_KEY_FILE; }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 254 "conf_lexer.l"
-{ return RSA_PRIVATE_KEY_FILE; }
+{ return RSA_PUBLIC_KEY_FILE; }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 255 "conf_lexer.l"
-{ return RSA_PUBLIC_KEY_FILE; }
+{ return T_SSL; }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 256 "conf_lexer.l"
-{ return T_SSL; }
+{ return SSL_CERTIFICATE_FILE; }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 257 "conf_lexer.l"
-{ return SSL_CERTIFICATE_FILE; }
+{ return T_SSL_CLIENT_METHOD; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 258 "conf_lexer.l"
-{ return T_SSL_CLIENT_METHOD; }
+{ return T_SSL_SERVER_METHOD; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 259 "conf_lexer.l"
-{ return T_SSL_SERVER_METHOD; }
+{ return SSL_DH_PARAM_FILE; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 260 "conf_lexer.l"
-{ return SSL_DH_PARAM_FILE; }
+{ return T_SSL_CIPHER_LIST; }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 261 "conf_lexer.l"
-{ return T_SSL_CIPHER_LIST; }
+{ return T_SSLV3; }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 262 "conf_lexer.l"
-{ return T_SSLV3; }
+{ return T_TLSV1; }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 263 "conf_lexer.l"
-{ return T_TLSV1; }
+{ return SEND_PASSWORD; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 264 "conf_lexer.l"
-{ return SEND_PASSWORD; }
+{ return SENDQ; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 265 "conf_lexer.l"
-{ return SENDQ; }
+{ return T_SERVER; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 266 "conf_lexer.l"
-{ return T_SERVER; }
+{ return SERVERHIDE; }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 267 "conf_lexer.l"
-{ return SERVERHIDE; }
+{ return SERVERINFO; }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 268 "conf_lexer.l"
-{ return SERVERINFO; }
+{ return T_SERVICE; }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 269 "conf_lexer.l"
-{ return T_SERVICE; }
+{ return T_SERVICES_NAME; }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 270 "conf_lexer.l"
-{ return T_SERVICES_NAME; }
+{ return T_SET; }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 271 "conf_lexer.l"
-{ return T_SET; }
+{ return T_SHARED; }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 272 "conf_lexer.l"
-{ return T_SHARED; }
+{ return SHORT_MOTD; }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 273 "conf_lexer.l"
-{ return SHORT_MOTD; }
+{ return IRCD_SID; }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 274 "conf_lexer.l"
-{ return IRCD_SID; }
+{ return T_SIZE; }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 275 "conf_lexer.l"
-{ return T_SIZE; }
+{ return SPOOF; }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 276 "conf_lexer.l"
-{ return SPOOF; }
+{ return SPOOF_NOTICE; }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 277 "conf_lexer.l"
-{ return SPOOF_NOTICE; }
+{ return TKLINE_EXPIRE_NOTICES; }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 278 "conf_lexer.l"
-{ return TKLINE_EXPIRE_NOTICES; }
+{ return TYPE; }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 279 "conf_lexer.l"
-{ return TYPE; }
+{ return TRUE_NO_OPER_FLOOD; }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 280 "conf_lexer.l"
-{ return TRUE_NO_OPER_FLOOD; }
+{ return T_UMODES; }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 281 "conf_lexer.l"
-{ return T_UMODES; }
+{ return UNKLINE; }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 282 "conf_lexer.l"
-{ return UNKLINE; }
+{ return T_UNDLINE; }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 283 "conf_lexer.l"
-{ return T_UNDLINE; }
+{ return T_UNLIMITED; }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 284 "conf_lexer.l"
-{ return T_UNLIMITED; }
+{ return USE_EGD; }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 285 "conf_lexer.l"
-{ return USE_EGD; }
+{ return USE_LOGGING; }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 286 "conf_lexer.l"
-{ return USE_LOGGING; }
+{ return THROTTLE_TIME; }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 287 "conf_lexer.l"
-{ return THROTTLE_TIME; }
+{ return USER; } 
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 288 "conf_lexer.l"
-{ return USER; } 
+{ return VHOST; }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 289 "conf_lexer.l"
-{ return VHOST; }
+{ return VHOST6; }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 290 "conf_lexer.l"
-{ return VHOST6; }
+{ return XLINE; }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 291 "conf_lexer.l"
-{ return XLINE; }
+{ yylval.number = 1; return TBOOL; }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 292 "conf_lexer.l"
-{ yylval.number = 1; return TBOOL; }
+#line 293 "conf_lexer.l"
+{ return FAILED_OPER_NOTICE; }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 294 "conf_lexer.l"
-{ return FAILED_OPER_NOTICE; }
+{ return MAX_ACCEPT; }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 295 "conf_lexer.l"
-{ return MAX_ACCEPT; }
+{ return MAX_NICK_CHANGES; }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 296 "conf_lexer.l"
-{ return MAX_NICK_CHANGES; }
+{ return MAX_CHANS_PER_OPER; }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 297 "conf_lexer.l"
-{ return MAX_CHANS_PER_OPER; }
+{ return MAX_CHANS_PER_USER; }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 298 "conf_lexer.l"
-{ return MAX_CHANS_PER_USER; }
+{ return MAX_NICK_TIME; }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 299 "conf_lexer.l"
-{ return MAX_NICK_TIME; }
+{ return ANTI_NICK_FLOOD; }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 300 "conf_lexer.l"
-{ return ANTI_NICK_FLOOD; }
+{ return ANTI_SPAM_EXIT_MESSAGE_TIME; }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 301 "conf_lexer.l"
-{ return ANTI_SPAM_EXIT_MESSAGE_TIME; }
+{ return TS_MAX_DELTA; }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 302 "conf_lexer.l"
-{ return TS_MAX_DELTA; }
+{ return TS_WARN_DELTA; }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 303 "conf_lexer.l"
-{ return TS_WARN_DELTA; }
+{ return LINKS_DELAY; }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 304 "conf_lexer.l"
-{ return LINKS_DELAY; }
+{ return WARN_NO_NLINE; }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 305 "conf_lexer.l"
-{ return WARN_NO_NLINE; }
+#line 306 "conf_lexer.l"
+{ return STATS_E_DISABLED; }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 307 "conf_lexer.l"
-{ return STATS_E_DISABLED; }
+{ return STATS_O_OPER_ONLY; }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 308 "conf_lexer.l"
-{ return STATS_O_OPER_ONLY; }
+{ return STATS_K_OPER_ONLY; }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 309 "conf_lexer.l"
-{ return STATS_K_OPER_ONLY; }
+{ return STATS_I_OPER_ONLY; }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 310 "conf_lexer.l"
-{ return STATS_I_OPER_ONLY; }
+{ return STATS_P_OPER_ONLY; }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 311 "conf_lexer.l"
-{ return STATS_P_OPER_ONLY; }
+{ return PACE_WAIT; }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 312 "conf_lexer.l"
-{ return PACE_WAIT; }
+{ return PACE_WAIT_SIMPLE; }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 313 "conf_lexer.l"
-{ return PACE_WAIT_SIMPLE; }
+{ return KNOCK_DELAY; }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 314 "conf_lexer.l"
-{ return KNOCK_DELAY; }
+{ return KNOCK_DELAY_CHANNEL; }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 315 "conf_lexer.l"
-{ return KNOCK_DELAY_CHANNEL; }
+{ return MAX_BANS; }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 316 "conf_lexer.l"
-{ return MAX_BANS; }
+{ return MODULES; }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 317 "conf_lexer.l"
-{ return MODULES; }
+{ return MODULE; }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 318 "conf_lexer.l"
-{ return MODULE; }
+{ return PATH; }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 319 "conf_lexer.l"
-{ return PATH; }
+{ return MAX_TARGETS; }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 320 "conf_lexer.l"
-{ return MAX_TARGETS; }
+#line 321 "conf_lexer.l"
+{ return T_UNXLINE; }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 322 "conf_lexer.l"
-{ return T_UNXLINE; }
+{ return T_UNRESV; }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 323 "conf_lexer.l"
-{ return T_UNRESV; }
+#line 324 "conf_lexer.l"
+{ return OPER_ONLY_UMODES; }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 325 "conf_lexer.l"
-{ return OPER_ONLY_UMODES; }
+{ return OPER_UMODES; }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 326 "conf_lexer.l"
-{ return OPER_UMODES; }
+{ return T_BOTS; }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 327 "conf_lexer.l"
-{ return T_BOTS; }
+{ return T_CCONN; }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 328 "conf_lexer.l"
-{ return T_CCONN; }
+{ return T_CCONN_FULL; }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 329 "conf_lexer.l"
-{ return T_CCONN_FULL; }
+{ return T_DEAF; }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 330 "conf_lexer.l"
-{ return T_DEAF; }
+{ return T_DEBUG; }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 331 "conf_lexer.l"
-{ return T_DEBUG; }
+{ return T_FULL; }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 332 "conf_lexer.l"
-{ return T_FULL; }
+{ return T_SKILL; }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 333 "conf_lexer.l"
-{ return T_SKILL; }
+{ return T_NCHANGE; }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 334 "conf_lexer.l"
-{ return T_NCHANGE; }
+{ return T_REJ; }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 335 "conf_lexer.l"
-{ return T_REJ; }
+{ return T_UNAUTH; }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 336 "conf_lexer.l"
-{ return T_UNAUTH; }
+{ return T_SPY; }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 337 "conf_lexer.l"
-{ return T_SPY; }
+{ return T_EXTERNAL; }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 338 "conf_lexer.l"
-{ return T_EXTERNAL; }
+{ return T_OPERWALL; }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 339 "conf_lexer.l"
-{ return T_OPERWALL; }
+{ return T_SERVNOTICE; }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 340 "conf_lexer.l"
-{ return T_SERVNOTICE; }
+{ return T_INVISIBLE; }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 341 "conf_lexer.l"
-{ return T_INVISIBLE; }
+{ return T_WALLOP; }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 342 "conf_lexer.l"
-{ return T_WALLOP; }
+{ return T_CALLERID; }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 343 "conf_lexer.l"
-{ return T_CALLERID; }
+{ return T_SOFTCALLERID; }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 344 "conf_lexer.l"
-{ return T_SOFTCALLERID; }
+{ return T_LOCOPS; }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
-#line 345 "conf_lexer.l"
-{ return T_LOCOPS; }
+#line 346 "conf_lexer.l"
+{ return WEEKS; }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
@@ -3081,7 +3076,7 @@ YY_RULE_SETUP
 case 215:
 YY_RULE_SETUP
 #line 348 "conf_lexer.l"
-{ return WEEKS; }
+{ return DAYS; }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
@@ -3091,7 +3086,7 @@ YY_RULE_SETUP
 case 217:
 YY_RULE_SETUP
 #line 350 "conf_lexer.l"
-{ return DAYS; }
+{ return HOURS; }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
@@ -3101,7 +3096,7 @@ YY_RULE_SETUP
 case 219:
 YY_RULE_SETUP
 #line 352 "conf_lexer.l"
-{ return HOURS; }
+{ return MINUTES; }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
@@ -3111,7 +3106,7 @@ YY_RULE_SETUP
 case 221:
 YY_RULE_SETUP
 #line 354 "conf_lexer.l"
-{ return MINUTES; }
+{ return SECONDS; }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
@@ -3120,8 +3115,8 @@ YY_RULE_SETUP
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
-#line 356 "conf_lexer.l"
-{ return SECONDS; }
+#line 357 "conf_lexer.l"
+{ return BYTES; }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
@@ -3131,7 +3126,7 @@ YY_RULE_SETUP
 case 225:
 YY_RULE_SETUP
 #line 359 "conf_lexer.l"
-{ return BYTES; }
+{ return KBYTES; }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
@@ -3156,7 +3151,7 @@ YY_RULE_SETUP
 case 230:
 YY_RULE_SETUP
 #line 364 "conf_lexer.l"
-{ return KBYTES; }
+{ return MBYTES; }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
@@ -3181,28 +3176,23 @@ YY_RULE_SETUP
 case 235:
 YY_RULE_SETUP
 #line 369 "conf_lexer.l"
-{ return MBYTES; }
-	YY_BREAK
-case 236:
-YY_RULE_SETUP
-#line 370 "conf_lexer.l"
 { return TWODOTS; }
 	YY_BREAK
-case 237:
+case 236:
 YY_RULE_SETUP
-#line 372 "conf_lexer.l"
+#line 371 "conf_lexer.l"
 { return yytext[0]; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 373 "conf_lexer.l"
+#line 372 "conf_lexer.l"
 { if (ieof()) yyterminate(); }
 	YY_BREAK
-case 238:
+case 237:
 YY_RULE_SETUP
-#line 375 "conf_lexer.l"
+#line 374 "conf_lexer.l"
 ECHO;
 	YY_BREAK
-#line 3206 "conf_lexer.c"
+#line 3196 "conf_lexer.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3493,7 +3483,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 1546 )
+			if ( yy_current_state >= 1539 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3521,11 +3511,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 1546 )
+		if ( yy_current_state >= 1539 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 1545);
+	yy_is_jam = (yy_current_state == 1538);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4158,7 +4148,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 375 "conf_lexer.l"
+#line 374 "conf_lexer.l"
 
 
 
diff --git a/src/conf_lexer.l b/src/conf_lexer.l
index d089a57..838d7ef 100644
--- a/src/conf_lexer.l
+++ b/src/conf_lexer.l
@@ -235,7 +235,6 @@ passwd		{ return PASSWORD; }
 password	{ return PASSWORD; }
 ping_cookie	{ return PING_COOKIE; }
 ping_time	{ return PING_TIME; }
-ping_warning	{ return PING_WARNING; }
 port		{ return PORT; }
 quarantine	{ return RESV; }
 quiet_on_ban    { return QUIET_ON_BAN; }
diff --git a/src/conf_parser.c b/src/conf_parser.c
index 68ec966..1351b92 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -297,105 +297,104 @@ extern int yydebug;
      PATH = 368,
      PING_COOKIE = 369,
      PING_TIME = 370,
-     PING_WARNING = 371,
-     PORT = 372,
-     QSTRING = 373,
-     QUIET_ON_BAN = 374,
-     REASON = 375,
-     REDIRPORT = 376,
-     REDIRSERV = 377,
-     REGEX_T = 378,
-     REHASH = 379,
-     REMOTE = 380,
-     REMOTEBAN = 381,
-     RESTRICT_CHANNELS = 382,
-     RSA_PRIVATE_KEY_FILE = 383,
-     RSA_PUBLIC_KEY_FILE = 384,
-     SSL_CERTIFICATE_FILE = 385,
-     SSL_DH_PARAM_FILE = 386,
-     T_SSL_CLIENT_METHOD = 387,
-     T_SSL_SERVER_METHOD = 388,
-     T_SSLV3 = 389,
-     T_TLSV1 = 390,
-     RESV = 391,
-     RESV_EXEMPT = 392,
-     SECONDS = 393,
-     MINUTES = 394,
-     HOURS = 395,
-     DAYS = 396,
-     WEEKS = 397,
-     SENDQ = 398,
-     SEND_PASSWORD = 399,
-     SERVERHIDE = 400,
-     SERVERINFO = 401,
-     IRCD_SID = 402,
-     TKLINE_EXPIRE_NOTICES = 403,
-     T_SHARED = 404,
-     T_CLUSTER = 405,
-     TYPE = 406,
-     SHORT_MOTD = 407,
-     SPOOF = 408,
-     SPOOF_NOTICE = 409,
-     STATS_E_DISABLED = 410,
-     STATS_I_OPER_ONLY = 411,
-     STATS_K_OPER_ONLY = 412,
-     STATS_O_OPER_ONLY = 413,
-     STATS_P_OPER_ONLY = 414,
-     TBOOL = 415,
-     TMASKED = 416,
-     TS_MAX_DELTA = 417,
-     TS_WARN_DELTA = 418,
-     TWODOTS = 419,
-     T_ALL = 420,
-     T_BOTS = 421,
-     T_SOFTCALLERID = 422,
-     T_CALLERID = 423,
-     T_CCONN = 424,
-     T_CCONN_FULL = 425,
-     T_SSL_CIPHER_LIST = 426,
-     T_DEAF = 427,
-     T_DEBUG = 428,
-     T_DLINE = 429,
-     T_EXTERNAL = 430,
-     T_FULL = 431,
-     T_INVISIBLE = 432,
-     T_IPV4 = 433,
-     T_IPV6 = 434,
-     T_LOCOPS = 435,
-     T_MAX_CLIENTS = 436,
-     T_NCHANGE = 437,
-     T_OPERWALL = 438,
-     T_RECVQ = 439,
-     T_REJ = 440,
-     T_SERVER = 441,
-     T_SERVNOTICE = 442,
-     T_SET = 443,
-     T_SKILL = 444,
-     T_SPY = 445,
-     T_SSL = 446,
-     T_UMODES = 447,
-     T_UNAUTH = 448,
-     T_UNDLINE = 449,
-     T_UNLIMITED = 450,
-     T_UNRESV = 451,
-     T_UNXLINE = 452,
-     T_GLOBOPS = 453,
-     T_WALLOP = 454,
-     T_RESTART = 455,
-     T_SERVICE = 456,
-     T_SERVICES_NAME = 457,
-     THROTTLE_TIME = 458,
-     TRUE_NO_OPER_FLOOD = 459,
-     UNKLINE = 460,
-     USER = 461,
-     USE_EGD = 462,
-     USE_LOGGING = 463,
-     VHOST = 464,
-     VHOST6 = 465,
-     XLINE = 466,
-     WARN_NO_NLINE = 467,
-     T_SIZE = 468,
-     T_FILE = 469
+     PORT = 371,
+     QSTRING = 372,
+     QUIET_ON_BAN = 373,
+     REASON = 374,
+     REDIRPORT = 375,
+     REDIRSERV = 376,
+     REGEX_T = 377,
+     REHASH = 378,
+     REMOTE = 379,
+     REMOTEBAN = 380,
+     RESTRICT_CHANNELS = 381,
+     RSA_PRIVATE_KEY_FILE = 382,
+     RSA_PUBLIC_KEY_FILE = 383,
+     SSL_CERTIFICATE_FILE = 384,
+     SSL_DH_PARAM_FILE = 385,
+     T_SSL_CLIENT_METHOD = 386,
+     T_SSL_SERVER_METHOD = 387,
+     T_SSLV3 = 388,
+     T_TLSV1 = 389,
+     RESV = 390,
+     RESV_EXEMPT = 391,
+     SECONDS = 392,
+     MINUTES = 393,
+     HOURS = 394,
+     DAYS = 395,
+     WEEKS = 396,
+     SENDQ = 397,
+     SEND_PASSWORD = 398,
+     SERVERHIDE = 399,
+     SERVERINFO = 400,
+     IRCD_SID = 401,
+     TKLINE_EXPIRE_NOTICES = 402,
+     T_SHARED = 403,
+     T_CLUSTER = 404,
+     TYPE = 405,
+     SHORT_MOTD = 406,
+     SPOOF = 407,
+     SPOOF_NOTICE = 408,
+     STATS_E_DISABLED = 409,
+     STATS_I_OPER_ONLY = 410,
+     STATS_K_OPER_ONLY = 411,
+     STATS_O_OPER_ONLY = 412,
+     STATS_P_OPER_ONLY = 413,
+     TBOOL = 414,
+     TMASKED = 415,
+     TS_MAX_DELTA = 416,
+     TS_WARN_DELTA = 417,
+     TWODOTS = 418,
+     T_ALL = 419,
+     T_BOTS = 420,
+     T_SOFTCALLERID = 421,
+     T_CALLERID = 422,
+     T_CCONN = 423,
+     T_CCONN_FULL = 424,
+     T_SSL_CIPHER_LIST = 425,
+     T_DEAF = 426,
+     T_DEBUG = 427,
+     T_DLINE = 428,
+     T_EXTERNAL = 429,
+     T_FULL = 430,
+     T_INVISIBLE = 431,
+     T_IPV4 = 432,
+     T_IPV6 = 433,
+     T_LOCOPS = 434,
+     T_MAX_CLIENTS = 435,
+     T_NCHANGE = 436,
+     T_OPERWALL = 437,
+     T_RECVQ = 438,
+     T_REJ = 439,
+     T_SERVER = 440,
+     T_SERVNOTICE = 441,
+     T_SET = 442,
+     T_SKILL = 443,
+     T_SPY = 444,
+     T_SSL = 445,
+     T_UMODES = 446,
+     T_UNAUTH = 447,
+     T_UNDLINE = 448,
+     T_UNLIMITED = 449,
+     T_UNRESV = 450,
+     T_UNXLINE = 451,
+     T_GLOBOPS = 452,
+     T_WALLOP = 453,
+     T_RESTART = 454,
+     T_SERVICE = 455,
+     T_SERVICES_NAME = 456,
+     THROTTLE_TIME = 457,
+     TRUE_NO_OPER_FLOOD = 458,
+     UNKLINE = 459,
+     USER = 460,
+     USE_EGD = 461,
+     USE_LOGGING = 462,
+     VHOST = 463,
+     VHOST6 = 464,
+     XLINE = 465,
+     WARN_NO_NLINE = 466,
+     T_SIZE = 467,
+     T_FILE = 468
    };
 #endif
 /* Tokens.  */
@@ -512,105 +511,104 @@ extern int yydebug;
 #define PATH 368
 #define PING_COOKIE 369
 #define PING_TIME 370
-#define PING_WARNING 371
-#define PORT 372
-#define QSTRING 373
-#define QUIET_ON_BAN 374
-#define REASON 375
-#define REDIRPORT 376
-#define REDIRSERV 377
-#define REGEX_T 378
-#define REHASH 379
-#define REMOTE 380
-#define REMOTEBAN 381
-#define RESTRICT_CHANNELS 382
-#define RSA_PRIVATE_KEY_FILE 383
-#define RSA_PUBLIC_KEY_FILE 384
-#define SSL_CERTIFICATE_FILE 385
-#define SSL_DH_PARAM_FILE 386
-#define T_SSL_CLIENT_METHOD 387
-#define T_SSL_SERVER_METHOD 388
-#define T_SSLV3 389
-#define T_TLSV1 390
-#define RESV 391
-#define RESV_EXEMPT 392
-#define SECONDS 393
-#define MINUTES 394
-#define HOURS 395
-#define DAYS 396
-#define WEEKS 397
-#define SENDQ 398
-#define SEND_PASSWORD 399
-#define SERVERHIDE 400
-#define SERVERINFO 401
-#define IRCD_SID 402
-#define TKLINE_EXPIRE_NOTICES 403
-#define T_SHARED 404
-#define T_CLUSTER 405
-#define TYPE 406
-#define SHORT_MOTD 407
-#define SPOOF 408
-#define SPOOF_NOTICE 409
-#define STATS_E_DISABLED 410
-#define STATS_I_OPER_ONLY 411
-#define STATS_K_OPER_ONLY 412
-#define STATS_O_OPER_ONLY 413
-#define STATS_P_OPER_ONLY 414
-#define TBOOL 415
-#define TMASKED 416
-#define TS_MAX_DELTA 417
-#define TS_WARN_DELTA 418
-#define TWODOTS 419
-#define T_ALL 420
-#define T_BOTS 421
-#define T_SOFTCALLERID 422
-#define T_CALLERID 423
-#define T_CCONN 424
-#define T_CCONN_FULL 425
-#define T_SSL_CIPHER_LIST 426
-#define T_DEAF 427
-#define T_DEBUG 428
-#define T_DLINE 429
-#define T_EXTERNAL 430
-#define T_FULL 431
-#define T_INVISIBLE 432
-#define T_IPV4 433
-#define T_IPV6 434
-#define T_LOCOPS 435
-#define T_MAX_CLIENTS 436
-#define T_NCHANGE 437
-#define T_OPERWALL 438
-#define T_RECVQ 439
-#define T_REJ 440
-#define T_SERVER 441
-#define T_SERVNOTICE 442
-#define T_SET 443
-#define T_SKILL 444
-#define T_SPY 445
-#define T_SSL 446
-#define T_UMODES 447
-#define T_UNAUTH 448
-#define T_UNDLINE 449
-#define T_UNLIMITED 450
-#define T_UNRESV 451
-#define T_UNXLINE 452
-#define T_GLOBOPS 453
-#define T_WALLOP 454
-#define T_RESTART 455
-#define T_SERVICE 456
-#define T_SERVICES_NAME 457
-#define THROTTLE_TIME 458
-#define TRUE_NO_OPER_FLOOD 459
-#define UNKLINE 460
-#define USER 461
-#define USE_EGD 462
-#define USE_LOGGING 463
-#define VHOST 464
-#define VHOST6 465
-#define XLINE 466
-#define WARN_NO_NLINE 467
-#define T_SIZE 468
-#define T_FILE 469
+#define PORT 371
+#define QSTRING 372
+#define QUIET_ON_BAN 373
+#define REASON 374
+#define REDIRPORT 375
+#define REDIRSERV 376
+#define REGEX_T 377
+#define REHASH 378
+#define REMOTE 379
+#define REMOTEBAN 380
+#define RESTRICT_CHANNELS 381
+#define RSA_PRIVATE_KEY_FILE 382
+#define RSA_PUBLIC_KEY_FILE 383
+#define SSL_CERTIFICATE_FILE 384
+#define SSL_DH_PARAM_FILE 385
+#define T_SSL_CLIENT_METHOD 386
+#define T_SSL_SERVER_METHOD 387
+#define T_SSLV3 388
+#define T_TLSV1 389
+#define RESV 390
+#define RESV_EXEMPT 391
+#define SECONDS 392
+#define MINUTES 393
+#define HOURS 394
+#define DAYS 395
+#define WEEKS 396
+#define SENDQ 397
+#define SEND_PASSWORD 398
+#define SERVERHIDE 399
+#define SERVERINFO 400
+#define IRCD_SID 401
+#define TKLINE_EXPIRE_NOTICES 402
+#define T_SHARED 403
+#define T_CLUSTER 404
+#define TYPE 405
+#define SHORT_MOTD 406
+#define SPOOF 407
+#define SPOOF_NOTICE 408
+#define STATS_E_DISABLED 409
+#define STATS_I_OPER_ONLY 410
+#define STATS_K_OPER_ONLY 411
+#define STATS_O_OPER_ONLY 412
+#define STATS_P_OPER_ONLY 413
+#define TBOOL 414
+#define TMASKED 415
+#define TS_MAX_DELTA 416
+#define TS_WARN_DELTA 417
+#define TWODOTS 418
+#define T_ALL 419
+#define T_BOTS 420
+#define T_SOFTCALLERID 421
+#define T_CALLERID 422
+#define T_CCONN 423
+#define T_CCONN_FULL 424
+#define T_SSL_CIPHER_LIST 425
+#define T_DEAF 426
+#define T_DEBUG 427
+#define T_DLINE 428
+#define T_EXTERNAL 429
+#define T_FULL 430
+#define T_INVISIBLE 431
+#define T_IPV4 432
+#define T_IPV6 433
+#define T_LOCOPS 434
+#define T_MAX_CLIENTS 435
+#define T_NCHANGE 436
+#define T_OPERWALL 437
+#define T_RECVQ 438
+#define T_REJ 439
+#define T_SERVER 440
+#define T_SERVNOTICE 441
+#define T_SET 442
+#define T_SKILL 443
+#define T_SPY 444
+#define T_SSL 445
+#define T_UMODES 446
+#define T_UNAUTH 447
+#define T_UNDLINE 448
+#define T_UNLIMITED 449
+#define T_UNRESV 450
+#define T_UNXLINE 451
+#define T_GLOBOPS 452
+#define T_WALLOP 453
+#define T_RESTART 454
+#define T_SERVICE 455
+#define T_SERVICES_NAME 456
+#define THROTTLE_TIME 457
+#define TRUE_NO_OPER_FLOOD 458
+#define UNKLINE 459
+#define USER 460
+#define USE_EGD 461
+#define USE_LOGGING 462
+#define VHOST 463
+#define VHOST6 464
+#define XLINE 465
+#define WARN_NO_NLINE 466
+#define T_SIZE 467
+#define T_FILE 468
 
 
 
@@ -625,7 +623,7 @@ typedef union YYSTYPE
 
 
 /* Line 374 of yacc.c  */
-#line 629 "conf_parser.c"
+#line 627 "conf_parser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -653,7 +651,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 377 of yacc.c  */
-#line 657 "conf_parser.c"
+#line 655 "conf_parser.c"
 
 #ifdef short
 # undef short
@@ -873,20 +871,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1206
+#define YYLAST   1180
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  220
+#define YYNTOKENS  219
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  283
+#define YYNNTS  282
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  627
+#define YYNRULES  625
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  1228
+#define YYNSTATES  1223
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   469
+#define YYMAXUTOK   468
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -898,15 +896,15 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,   219,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   215,
-       2,   218,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,   218,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   214,
+       2,   217,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   217,     2,   216,     2,     2,     2,     2,
+       2,     2,     2,   216,     2,   215,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -940,7 +938,7 @@ static const yytype_uint8 yytranslate[] =
      175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
      185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
      195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214
+     205,   206,   207,   208,   209,   210,   211,   212,   213
 };
 
 #if YYDEBUG
@@ -969,312 +967,312 @@ static const yytype_uint16 yyprhs[] =
      522,   524,   526,   528,   530,   532,   534,   536,   538,   540,
      542,   544,   546,   548,   550,   552,   553,   560,   563,   565,
      567,   569,   571,   573,   575,   577,   579,   581,   583,   585,
-     587,   589,   591,   593,   596,   601,   606,   611,   616,   621,
-     626,   631,   636,   641,   646,   651,   656,   661,   666,   667,
-     674,   675,   681,   685,   687,   689,   691,   693,   696,   698,
-     700,   702,   704,   706,   709,   710,   716,   720,   722,   724,
-     728,   733,   738,   739,   746,   749,   751,   753,   755,   757,
-     759,   761,   763,   765,   767,   770,   775,   780,   785,   790,
-     791,   797,   801,   803,   805,   807,   809,   811,   813,   815,
-     817,   819,   821,   826,   831,   836,   837,   844,   847,   849,
-     851,   853,   855,   858,   863,   868,   873,   879,   882,   884,
-     886,   888,   893,   894,   901,   904,   906,   908,   910,   912,
-     915,   920,   925,   926,   932,   936,   938,   940,   942,   944,
-     946,   948,   950,   952,   954,   956,   958,   959,   966,   969,
-     971,   973,   975,   978,   983,   984,   990,   994,   996,   998,
-    1000,  1002,  1004,  1006,  1008,  1010,  1012,  1014,  1016,  1017,
-    1024,  1027,  1029,  1031,  1033,  1035,  1037,  1039,  1041,  1043,
-    1045,  1047,  1049,  1051,  1053,  1055,  1058,  1063,  1068,  1073,
-    1078,  1083,  1088,  1093,  1098,  1099,  1105,  1109,  1111,  1113,
-    1115,  1120,  1125,  1130,  1135,  1140,  1141,  1148,  1149,  1155,
-    1159,  1161,  1163,  1166,  1168,  1170,  1172,  1174,  1176,  1181,
-    1186,  1187,  1194,  1197,  1199,  1201,  1203,  1205,  1210,  1215,
-    1221,  1224,  1226,  1228,  1230,  1235,  1236,  1243,  1244,  1250,
-    1254,  1256,  1258,  1261,  1263,  1265,  1267,  1269,  1271,  1276,
-    1281,  1287,  1290,  1292,  1294,  1296,  1298,  1300,  1302,  1304,
-    1306,  1308,  1310,  1312,  1314,  1316,  1318,  1320,  1322,  1324,
-    1326,  1328,  1330,  1332,  1334,  1336,  1338,  1340,  1342,  1344,
-    1346,  1348,  1350,  1352,  1354,  1356,  1358,  1360,  1362,  1364,
-    1366,  1368,  1370,  1372,  1374,  1376,  1378,  1380,  1382,  1384,
-    1386,  1388,  1390,  1392,  1397,  1402,  1407,  1412,  1417,  1422,
-    1427,  1432,  1437,  1442,  1447,  1452,  1457,  1462,  1467,  1472,
-    1477,  1482,  1487,  1492,  1497,  1502,  1507,  1512,  1517,  1522,
-    1527,  1532,  1537,  1542,  1547,  1552,  1557,  1562,  1567,  1572,
-    1577,  1582,  1587,  1592,  1597,  1602,  1607,  1612,  1617,  1622,
-    1623,  1629,  1633,  1635,  1637,  1639,  1641,  1643,  1645,  1647,
-    1649,  1651,  1653,  1655,  1657,  1659,  1661,  1663,  1665,  1667,
-    1669,  1671,  1673,  1675,  1676,  1682,  1686,  1688,  1690,  1692,
-    1694,  1696,  1698,  1700,  1702,  1704,  1706,  1708,  1710,  1712,
-    1714,  1716,  1718,  1720,  1722,  1724,  1726,  1728,  1733,  1738,
-    1743,  1749,  1752,  1754,  1756,  1758,  1760,  1762,  1764,  1766,
-    1768,  1770,  1772,  1774,  1776,  1778,  1780,  1782,  1784,  1789,
-    1794,  1799,  1804,  1809,  1814,  1819,  1824,  1829,  1834,  1839,
-    1844,  1849,  1854,  1860,  1863,  1865,  1867,  1869,  1871,  1873,
-    1875,  1877,  1879,  1884,  1889,  1894,  1899,  1904
+     587,   589,   591,   594,   599,   604,   609,   614,   619,   624,
+     629,   634,   639,   644,   649,   654,   659,   660,   667,   668,
+     674,   678,   680,   682,   684,   686,   689,   691,   693,   695,
+     697,   699,   702,   703,   709,   713,   715,   717,   721,   726,
+     731,   732,   739,   742,   744,   746,   748,   750,   752,   754,
+     756,   758,   760,   763,   768,   773,   778,   783,   784,   790,
+     794,   796,   798,   800,   802,   804,   806,   808,   810,   812,
+     814,   819,   824,   829,   830,   837,   840,   842,   844,   846,
+     848,   851,   856,   861,   866,   872,   875,   877,   879,   881,
+     886,   887,   894,   897,   899,   901,   903,   905,   908,   913,
+     918,   919,   925,   929,   931,   933,   935,   937,   939,   941,
+     943,   945,   947,   949,   951,   952,   959,   962,   964,   966,
+     968,   971,   976,   977,   983,   987,   989,   991,   993,   995,
+     997,   999,  1001,  1003,  1005,  1007,  1009,  1010,  1017,  1020,
+    1022,  1024,  1026,  1028,  1030,  1032,  1034,  1036,  1038,  1040,
+    1042,  1044,  1046,  1048,  1051,  1056,  1061,  1066,  1071,  1076,
+    1081,  1086,  1091,  1092,  1098,  1102,  1104,  1106,  1108,  1113,
+    1118,  1123,  1128,  1133,  1134,  1141,  1142,  1148,  1152,  1154,
+    1156,  1159,  1161,  1163,  1165,  1167,  1169,  1174,  1179,  1180,
+    1187,  1190,  1192,  1194,  1196,  1198,  1203,  1208,  1214,  1217,
+    1219,  1221,  1223,  1228,  1229,  1236,  1237,  1243,  1247,  1249,
+    1251,  1254,  1256,  1258,  1260,  1262,  1264,  1269,  1274,  1280,
+    1283,  1285,  1287,  1289,  1291,  1293,  1295,  1297,  1299,  1301,
+    1303,  1305,  1307,  1309,  1311,  1313,  1315,  1317,  1319,  1321,
+    1323,  1325,  1327,  1329,  1331,  1333,  1335,  1337,  1339,  1341,
+    1343,  1345,  1347,  1349,  1351,  1353,  1355,  1357,  1359,  1361,
+    1363,  1365,  1367,  1369,  1371,  1373,  1375,  1377,  1379,  1381,
+    1383,  1385,  1390,  1395,  1400,  1405,  1410,  1415,  1420,  1425,
+    1430,  1435,  1440,  1445,  1450,  1455,  1460,  1465,  1470,  1475,
+    1480,  1485,  1490,  1495,  1500,  1505,  1510,  1515,  1520,  1525,
+    1530,  1535,  1540,  1545,  1550,  1555,  1560,  1565,  1570,  1575,
+    1580,  1585,  1590,  1595,  1600,  1605,  1610,  1615,  1616,  1622,
+    1626,  1628,  1630,  1632,  1634,  1636,  1638,  1640,  1642,  1644,
+    1646,  1648,  1650,  1652,  1654,  1656,  1658,  1660,  1662,  1664,
+    1666,  1668,  1669,  1675,  1679,  1681,  1683,  1685,  1687,  1689,
+    1691,  1693,  1695,  1697,  1699,  1701,  1703,  1705,  1707,  1709,
+    1711,  1713,  1715,  1717,  1719,  1721,  1726,  1731,  1736,  1742,
+    1745,  1747,  1749,  1751,  1753,  1755,  1757,  1759,  1761,  1763,
+    1765,  1767,  1769,  1771,  1773,  1775,  1777,  1782,  1787,  1792,
+    1797,  1802,  1807,  1812,  1817,  1822,  1827,  1832,  1837,  1842,
+    1847,  1853,  1856,  1858,  1860,  1862,  1864,  1866,  1868,  1870,
+    1872,  1877,  1882,  1887,  1892,  1897
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     221,     0,    -1,    -1,   221,   222,    -1,   254,    -1,   260,
-      -1,   274,    -1,   477,    -1,   292,    -1,   310,    -1,   324,
-      -1,   232,    -1,   494,    -1,   339,    -1,   346,    -1,   350,
-      -1,   360,    -1,   369,    -1,   389,    -1,   399,    -1,   405,
-      -1,   419,    -1,   409,    -1,   227,    -1,     1,   215,    -1,
-       1,   216,    -1,    -1,   224,    -1,    99,   223,    -1,    99,
-     138,   223,    -1,    99,   139,   223,    -1,    99,   140,   223,
-      -1,    99,   141,   223,    -1,    99,   142,   223,    -1,    -1,
-     226,    -1,    99,   225,    -1,    99,     9,   225,    -1,    99,
-      10,   225,    -1,    99,    11,   225,    -1,    88,   217,   228,
-     216,   215,    -1,   228,   229,    -1,   229,    -1,   230,    -1,
-     231,    -1,     1,   215,    -1,    87,   218,   118,   215,    -1,
-     113,   218,   118,   215,    -1,   146,   217,   233,   216,   215,
-      -1,   233,   234,    -1,   234,    -1,   245,    -1,   250,    -1,
-     253,    -1,   247,    -1,   248,    -1,   249,    -1,   252,    -1,
-     243,    -1,   242,    -1,   251,    -1,   246,    -1,   241,    -1,
-     235,    -1,   236,    -1,   244,    -1,     1,   215,    -1,   132,
-     218,   237,   215,    -1,   133,   218,   239,   215,    -1,   237,
-     219,   238,    -1,   238,    -1,   134,    -1,   135,    -1,   239,
-     219,   240,    -1,   240,    -1,   134,    -1,   135,    -1,   130,
-     218,   118,   215,    -1,   128,   218,   118,   215,    -1,   131,
-     218,   118,   215,    -1,   171,   218,   118,   215,    -1,    89,
-     218,   118,   215,    -1,   147,   218,   118,   215,    -1,    24,
-     218,   118,   215,    -1,    92,   218,   118,   215,    -1,    91,
-     218,   118,   215,    -1,   209,   218,   118,   215,    -1,   210,
-     218,   118,   215,    -1,   181,   218,    99,   215,    -1,    57,
-     218,   160,   215,    -1,     4,   217,   255,   216,   215,    -1,
-     255,   256,    -1,   256,    -1,   257,    -1,   259,    -1,   258,
-      -1,     1,   215,    -1,    89,   218,   118,   215,    -1,    31,
-     218,   118,   215,    -1,    24,   218,   118,   215,    -1,    71,
-     217,   261,   216,   215,    -1,   261,   262,    -1,   262,    -1,
-     263,    -1,   264,    -1,     1,   215,    -1,   208,   218,   160,
-     215,    -1,    -1,   265,   214,   217,   266,   216,   215,    -1,
-     266,   267,    -1,   267,    -1,   268,    -1,   270,    -1,   269,
-      -1,     1,   215,    -1,    89,   218,   118,   215,    -1,   213,
-     218,   226,   215,    -1,   213,   218,   195,   215,    -1,    -1,
-     151,   271,   218,   272,   215,    -1,   272,   219,   273,    -1,
-     273,    -1,   206,    -1,   102,    -1,    40,    -1,   174,    -1,
-      64,    -1,    62,    -1,   173,    -1,    -1,   102,   275,   217,
-     276,   216,   215,    -1,   276,   277,    -1,   277,    -1,   278,
-      -1,   279,    -1,   280,    -1,   284,    -1,   283,    -1,   281,
-      -1,   282,    -1,   288,    -1,     1,   215,    -1,    89,   218,
-     118,   215,    -1,   206,   218,   118,   215,    -1,   112,   218,
-     118,   215,    -1,    32,   218,   160,   215,    -1,   129,   218,
-     118,   215,    -1,    17,   218,   118,   215,    -1,    -1,   192,
-     285,   218,   286,   215,    -1,   286,   219,   287,    -1,   287,
-      -1,   166,    -1,   169,    -1,   170,    -1,   172,    -1,   173,
-      -1,   176,    -1,    51,    -1,   189,    -1,   182,    -1,   185,
-      -1,   193,    -1,   190,    -1,   175,    -1,   183,    -1,   187,
-      -1,   177,    -1,   199,    -1,   167,    -1,   168,    -1,   180,
-      -1,    -1,    36,   289,   218,   290,   215,    -1,   290,   219,
-     291,    -1,   291,    -1,    47,    -1,   125,    -1,    64,    -1,
-     205,    -1,   174,    -1,   194,    -1,   211,    -1,    40,    -1,
-      25,    -1,   200,    -1,   124,    -1,     4,    -1,    94,    -1,
-     183,    -1,   198,    -1,   106,    -1,   126,    -1,   188,    -1,
-      87,    -1,    -1,    17,   293,   217,   294,   216,   215,    -1,
-     294,   295,    -1,   295,    -1,   296,    -1,   307,    -1,   308,
-      -1,   297,    -1,   298,    -1,   309,    -1,   299,    -1,   300,
-      -1,   301,    -1,   302,    -1,   303,    -1,   304,    -1,   305,
-      -1,   306,    -1,     1,   215,    -1,    89,   218,   118,   215,
-      -1,   115,   218,   224,   215,    -1,   116,   218,   224,   215,
-      -1,   101,   218,    99,   215,    -1,    19,   218,   224,   215,
-      -1,    81,   218,    99,   215,    -1,    76,   218,    99,   215,
-      -1,    78,   218,    99,   215,    -1,    77,   218,    99,   215,
-      -1,   143,   218,   226,   215,    -1,   184,   218,   226,   215,
-      -1,    15,   218,    99,   215,    -1,    16,   218,    99,   215,
-      -1,   100,   218,    99,   215,    -1,    -1,    70,   311,   217,
-     316,   216,   215,    -1,    -1,    36,   313,   218,   314,   215,
-      -1,   314,   219,   315,    -1,   315,    -1,   191,    -1,    51,
-      -1,   186,    -1,   316,   317,    -1,   317,    -1,   318,    -1,
-     312,    -1,   322,    -1,   323,    -1,     1,   215,    -1,    -1,
-     117,   218,   320,   319,   215,    -1,   320,   219,   321,    -1,
-     321,    -1,    99,    -1,    99,   164,    99,    -1,    61,   218,
-     118,   215,    -1,    56,   218,   118,   215,    -1,    -1,    48,
-     325,   217,   326,   216,   215,    -1,   326,   327,    -1,   327,
-      -1,   328,    -1,   329,    -1,   330,    -1,   332,    -1,   336,
-      -1,   337,    -1,   338,    -1,   331,    -1,     1,   215,    -1,
-     206,   218,   118,   215,    -1,   112,   218,   118,   215,    -1,
-      17,   218,   118,   215,    -1,    32,   218,   160,   215,    -1,
-      -1,    36,   333,   218,   334,   215,    -1,   334,   219,   335,
-      -1,   335,    -1,   154,    -1,    33,    -1,    65,    -1,    49,
-      -1,    13,    -1,    98,    -1,    43,    -1,   137,    -1,    90,
-      -1,   153,   218,   118,   215,    -1,   122,   218,   118,   215,
-      -1,   121,   218,    99,   215,    -1,    -1,   136,   340,   217,
-     341,   216,   215,    -1,   341,   342,    -1,   342,    -1,   343,
-      -1,   344,    -1,   345,    -1,     1,   215,    -1,   120,   218,
-     118,   215,    -1,    14,   218,   118,   215,    -1,    93,   218,
-     118,   215,    -1,   201,   217,   347,   216,   215,    -1,   347,
-     348,    -1,   348,    -1,   349,    -1,     1,    -1,    89,   218,
-     118,   215,    -1,    -1,   149,   351,   217,   352,   216,   215,
-      -1,   352,   353,    -1,   353,    -1,   354,    -1,   355,    -1,
-     356,    -1,     1,   215,    -1,    89,   218,   118,   215,    -1,
-     206,   218,   118,   215,    -1,    -1,   151,   357,   218,   358,
-     215,    -1,   358,   219,   359,    -1,   359,    -1,    64,    -1,
-     205,    -1,   174,    -1,   194,    -1,   211,    -1,   197,    -1,
-     136,    -1,   196,    -1,   180,    -1,   165,    -1,    -1,   150,
-     361,   217,   362,   216,   215,    -1,   362,   363,    -1,   363,
-      -1,   364,    -1,   365,    -1,     1,   215,    -1,    89,   218,
-     118,   215,    -1,    -1,   151,   366,   218,   367,   215,    -1,
-     367,   219,   368,    -1,   368,    -1,    64,    -1,   205,    -1,
-     174,    -1,   194,    -1,   211,    -1,   197,    -1,   136,    -1,
-     196,    -1,   180,    -1,   165,    -1,    -1,    18,   370,   217,
-     371,   216,   215,    -1,   371,   372,    -1,   372,    -1,   373,
-      -1,   374,    -1,   375,    -1,   376,    -1,   377,    -1,   379,
-      -1,   378,    -1,   388,    -1,   380,    -1,   385,    -1,   386,
-      -1,   387,    -1,   384,    -1,     1,   215,    -1,    89,   218,
-     118,   215,    -1,    56,   218,   118,   215,    -1,   209,   218,
-     118,   215,    -1,   144,   218,   118,   215,    -1,     3,   218,
-     118,   215,    -1,   117,   218,    99,   215,    -1,     5,   218,
-     178,   215,    -1,     5,   218,   179,   215,    -1,    -1,    36,
-     381,   218,   382,   215,    -1,   382,   219,   383,    -1,   383,
-      -1,     8,    -1,   191,    -1,    32,   218,   160,   215,    -1,
-      58,   218,   118,   215,    -1,    68,   218,   118,   215,    -1,
-      17,   218,   118,   215,    -1,   171,   218,   118,   215,    -1,
-      -1,    62,   390,   217,   395,   216,   215,    -1,    -1,   151,
-     392,   218,   393,   215,    -1,   393,   219,   394,    -1,   394,
-      -1,   123,    -1,   395,   396,    -1,   396,    -1,   397,    -1,
-     398,    -1,   391,    -1,     1,    -1,   206,   218,   118,   215,
-      -1,   120,   218,   118,   215,    -1,    -1,    23,   400,   217,
-     401,   216,   215,    -1,   401,   402,    -1,   402,    -1,   403,
-      -1,   404,    -1,     1,    -1,    61,   218,   118,   215,    -1,
-     120,   218,   118,   215,    -1,    34,   217,   406,   216,   215,
-      -1,   406,   407,    -1,   407,    -1,   408,    -1,     1,    -1,
-      61,   218,   118,   215,    -1,    -1,    38,   410,   217,   415,
-     216,   215,    -1,    -1,   151,   412,   218,   413,   215,    -1,
-     413,   219,   414,    -1,   414,    -1,   123,    -1,   415,   416,
-      -1,   416,    -1,   417,    -1,   418,    -1,   411,    -1,     1,
-      -1,    89,   218,   118,   215,    -1,   120,   218,   118,   215,
-      -1,    39,   217,   420,   216,   215,    -1,   420,   421,    -1,
-     421,    -1,   430,    -1,   431,    -1,   433,    -1,   434,    -1,
-     435,    -1,   436,    -1,   437,    -1,   438,    -1,   439,    -1,
-     440,    -1,   429,    -1,   442,    -1,   443,    -1,   458,    -1,
-     445,    -1,   447,    -1,   449,    -1,   448,    -1,   452,    -1,
-     446,    -1,   453,    -1,   454,    -1,   455,    -1,   456,    -1,
-     457,    -1,   470,    -1,   459,    -1,   460,    -1,   461,    -1,
-     466,    -1,   450,    -1,   451,    -1,   476,    -1,   474,    -1,
-     475,    -1,   432,    -1,   465,    -1,   441,    -1,   463,    -1,
-     464,    -1,   428,    -1,   423,    -1,   424,    -1,   425,    -1,
-     426,    -1,   427,    -1,   444,    -1,   422,    -1,   462,    -1,
-       1,    -1,    83,   218,    99,   215,    -1,    42,   218,   160,
-     215,    -1,    41,   218,   224,   215,    -1,    44,   218,   224,
-     215,    -1,    45,   218,    99,   215,    -1,    46,   218,    99,
-     215,    -1,   148,   218,   160,   215,    -1,    63,   218,   224,
-     215,    -1,    55,   218,   160,   215,    -1,    59,   218,   160,
-     215,    -1,    28,   218,   160,   215,    -1,    35,   218,   160,
-     215,    -1,     6,   218,   160,   215,    -1,    80,   218,   224,
-     215,    -1,    79,   218,    99,   215,    -1,    72,   218,    99,
-     215,    -1,     7,   218,   224,   215,    -1,   163,   218,   224,
-     215,    -1,   162,   218,   224,   215,    -1,    50,   218,    99,
-     215,    -1,    60,   218,   160,   215,    -1,   212,   218,   160,
-     215,    -1,   155,   218,   160,   215,    -1,   158,   218,   160,
-     215,    -1,   159,   218,   160,   215,    -1,   157,   218,   160,
-     215,    -1,   157,   218,   161,   215,    -1,   156,   218,   160,
-     215,    -1,   156,   218,   161,   215,    -1,   110,   218,   224,
-     215,    -1,    12,   218,   224,   215,    -1,   103,   218,   160,
-     215,    -1,   111,   218,   224,   215,    -1,   152,   218,   160,
-     215,    -1,    97,   218,   160,   215,    -1,   204,   218,   160,
-     215,    -1,   105,   218,   160,   215,    -1,    84,   218,   118,
-     215,    -1,    29,   218,    99,   215,    -1,    82,   218,    99,
-     215,    -1,   207,   218,   160,   215,    -1,    30,   218,   118,
-     215,    -1,   202,   218,   118,   215,    -1,   114,   218,   160,
-     215,    -1,    26,   218,   160,   215,    -1,   203,   218,   224,
-     215,    -1,    -1,   107,   467,   218,   468,   215,    -1,   468,
-     219,   469,    -1,   469,    -1,   166,    -1,   169,    -1,   170,
-      -1,   172,    -1,   173,    -1,   176,    -1,    51,    -1,   189,
-      -1,   182,    -1,   185,    -1,   193,    -1,   190,    -1,   175,
-      -1,   183,    -1,   187,    -1,   177,    -1,   199,    -1,   167,
-      -1,   168,    -1,   180,    -1,    -1,   104,   471,   218,   472,
-     215,    -1,   472,   219,   473,    -1,   473,    -1,   166,    -1,
-     169,    -1,   170,    -1,   172,    -1,   173,    -1,   176,    -1,
-     189,    -1,    51,    -1,   182,    -1,   185,    -1,   193,    -1,
-     190,    -1,   175,    -1,   183,    -1,   187,    -1,   177,    -1,
-     199,    -1,   167,    -1,   168,    -1,   180,    -1,    85,   218,
-      99,   215,    -1,    86,   218,    99,   215,    -1,    20,   218,
-      99,   215,    -1,    14,   217,   478,   216,   215,    -1,   478,
-     479,    -1,   479,    -1,   487,    -1,   482,    -1,   483,    -1,
-     484,    -1,   485,    -1,   486,    -1,   488,    -1,   489,    -1,
-     490,    -1,   481,    -1,   491,    -1,   492,    -1,   493,    -1,
-     480,    -1,     1,    -1,    27,   218,   160,   215,    -1,   127,
-     218,   160,   215,    -1,    66,   218,   224,   215,    -1,    67,
-     218,   224,   215,    -1,    75,   218,    99,   215,    -1,    74,
-     218,    99,   215,    -1,   119,   218,   160,   215,    -1,    73,
-     218,    99,   215,    -1,    22,   218,    99,   215,    -1,    21,
-     218,    99,   215,    -1,    95,   218,   160,   215,    -1,    96,
-     218,   160,   215,    -1,   108,   218,    99,   215,    -1,   109,
-     218,   224,   215,    -1,   145,   217,   495,   216,   215,    -1,
-     495,   496,    -1,   496,    -1,   497,    -1,   498,    -1,   500,
-      -1,   501,    -1,   499,    -1,   502,    -1,     1,    -1,    37,
-     218,   160,   215,    -1,    54,   218,   160,   215,    -1,    52,
-     218,   118,   215,    -1,    69,   218,   224,   215,    -1,    51,
-     218,   160,   215,    -1,    53,   218,   160,   215,    -1
+     220,     0,    -1,    -1,   220,   221,    -1,   253,    -1,   259,
+      -1,   273,    -1,   475,    -1,   291,    -1,   308,    -1,   322,
+      -1,   231,    -1,   492,    -1,   337,    -1,   344,    -1,   348,
+      -1,   358,    -1,   367,    -1,   387,    -1,   397,    -1,   403,
+      -1,   417,    -1,   407,    -1,   226,    -1,     1,   214,    -1,
+       1,   215,    -1,    -1,   223,    -1,    99,   222,    -1,    99,
+     137,   222,    -1,    99,   138,   222,    -1,    99,   139,   222,
+      -1,    99,   140,   222,    -1,    99,   141,   222,    -1,    -1,
+     225,    -1,    99,   224,    -1,    99,     9,   224,    -1,    99,
+      10,   224,    -1,    99,    11,   224,    -1,    88,   216,   227,
+     215,   214,    -1,   227,   228,    -1,   228,    -1,   229,    -1,
+     230,    -1,     1,   214,    -1,    87,   217,   117,   214,    -1,
+     113,   217,   117,   214,    -1,   145,   216,   232,   215,   214,
+      -1,   232,   233,    -1,   233,    -1,   244,    -1,   249,    -1,
+     252,    -1,   246,    -1,   247,    -1,   248,    -1,   251,    -1,
+     242,    -1,   241,    -1,   250,    -1,   245,    -1,   240,    -1,
+     234,    -1,   235,    -1,   243,    -1,     1,   214,    -1,   131,
+     217,   236,   214,    -1,   132,   217,   238,   214,    -1,   236,
+     218,   237,    -1,   237,    -1,   133,    -1,   134,    -1,   238,
+     218,   239,    -1,   239,    -1,   133,    -1,   134,    -1,   129,
+     217,   117,   214,    -1,   127,   217,   117,   214,    -1,   130,
+     217,   117,   214,    -1,   170,   217,   117,   214,    -1,    89,
+     217,   117,   214,    -1,   146,   217,   117,   214,    -1,    24,
+     217,   117,   214,    -1,    92,   217,   117,   214,    -1,    91,
+     217,   117,   214,    -1,   208,   217,   117,   214,    -1,   209,
+     217,   117,   214,    -1,   180,   217,    99,   214,    -1,    57,
+     217,   159,   214,    -1,     4,   216,   254,   215,   214,    -1,
+     254,   255,    -1,   255,    -1,   256,    -1,   258,    -1,   257,
+      -1,     1,   214,    -1,    89,   217,   117,   214,    -1,    31,
+     217,   117,   214,    -1,    24,   217,   117,   214,    -1,    71,
+     216,   260,   215,   214,    -1,   260,   261,    -1,   261,    -1,
+     262,    -1,   263,    -1,     1,   214,    -1,   207,   217,   159,
+     214,    -1,    -1,   264,   213,   216,   265,   215,   214,    -1,
+     265,   266,    -1,   266,    -1,   267,    -1,   269,    -1,   268,
+      -1,     1,   214,    -1,    89,   217,   117,   214,    -1,   212,
+     217,   225,   214,    -1,   212,   217,   194,   214,    -1,    -1,
+     150,   270,   217,   271,   214,    -1,   271,   218,   272,    -1,
+     272,    -1,   205,    -1,   102,    -1,    40,    -1,   173,    -1,
+      64,    -1,    62,    -1,   172,    -1,    -1,   102,   274,   216,
+     275,   215,   214,    -1,   275,   276,    -1,   276,    -1,   277,
+      -1,   278,    -1,   279,    -1,   283,    -1,   282,    -1,   280,
+      -1,   281,    -1,   287,    -1,     1,   214,    -1,    89,   217,
+     117,   214,    -1,   205,   217,   117,   214,    -1,   112,   217,
+     117,   214,    -1,    32,   217,   159,   214,    -1,   128,   217,
+     117,   214,    -1,    17,   217,   117,   214,    -1,    -1,   191,
+     284,   217,   285,   214,    -1,   285,   218,   286,    -1,   286,
+      -1,   165,    -1,   168,    -1,   169,    -1,   171,    -1,   172,
+      -1,   175,    -1,    51,    -1,   188,    -1,   181,    -1,   184,
+      -1,   192,    -1,   189,    -1,   174,    -1,   182,    -1,   186,
+      -1,   176,    -1,   198,    -1,   166,    -1,   167,    -1,   179,
+      -1,    -1,    36,   288,   217,   289,   214,    -1,   289,   218,
+     290,    -1,   290,    -1,    47,    -1,   124,    -1,    64,    -1,
+     204,    -1,   173,    -1,   193,    -1,   210,    -1,    40,    -1,
+      25,    -1,   199,    -1,   123,    -1,     4,    -1,    94,    -1,
+     182,    -1,   197,    -1,   106,    -1,   125,    -1,   187,    -1,
+      87,    -1,    -1,    17,   292,   216,   293,   215,   214,    -1,
+     293,   294,    -1,   294,    -1,   295,    -1,   305,    -1,   306,
+      -1,   296,    -1,   307,    -1,   297,    -1,   298,    -1,   299,
+      -1,   300,    -1,   301,    -1,   302,    -1,   303,    -1,   304,
+      -1,     1,   214,    -1,    89,   217,   117,   214,    -1,   115,
+     217,   223,   214,    -1,   101,   217,    99,   214,    -1,    19,
+     217,   223,   214,    -1,    81,   217,    99,   214,    -1,    76,
+     217,    99,   214,    -1,    78,   217,    99,   214,    -1,    77,
+     217,    99,   214,    -1,   142,   217,   225,   214,    -1,   183,
+     217,   225,   214,    -1,    15,   217,    99,   214,    -1,    16,
+     217,    99,   214,    -1,   100,   217,    99,   214,    -1,    -1,
+      70,   309,   216,   314,   215,   214,    -1,    -1,    36,   311,
+     217,   312,   214,    -1,   312,   218,   313,    -1,   313,    -1,
+     190,    -1,    51,    -1,   185,    -1,   314,   315,    -1,   315,
+      -1,   316,    -1,   310,    -1,   320,    -1,   321,    -1,     1,
+     214,    -1,    -1,   116,   217,   318,   317,   214,    -1,   318,
+     218,   319,    -1,   319,    -1,    99,    -1,    99,   163,    99,
+      -1,    61,   217,   117,   214,    -1,    56,   217,   117,   214,
+      -1,    -1,    48,   323,   216,   324,   215,   214,    -1,   324,
+     325,    -1,   325,    -1,   326,    -1,   327,    -1,   328,    -1,
+     330,    -1,   334,    -1,   335,    -1,   336,    -1,   329,    -1,
+       1,   214,    -1,   205,   217,   117,   214,    -1,   112,   217,
+     117,   214,    -1,    17,   217,   117,   214,    -1,    32,   217,
+     159,   214,    -1,    -1,    36,   331,   217,   332,   214,    -1,
+     332,   218,   333,    -1,   333,    -1,   153,    -1,    33,    -1,
+      65,    -1,    49,    -1,    13,    -1,    98,    -1,    43,    -1,
+     136,    -1,    90,    -1,   152,   217,   117,   214,    -1,   121,
+     217,   117,   214,    -1,   120,   217,    99,   214,    -1,    -1,
+     135,   338,   216,   339,   215,   214,    -1,   339,   340,    -1,
+     340,    -1,   341,    -1,   342,    -1,   343,    -1,     1,   214,
+      -1,   119,   217,   117,   214,    -1,    14,   217,   117,   214,
+      -1,    93,   217,   117,   214,    -1,   200,   216,   345,   215,
+     214,    -1,   345,   346,    -1,   346,    -1,   347,    -1,     1,
+      -1,    89,   217,   117,   214,    -1,    -1,   148,   349,   216,
+     350,   215,   214,    -1,   350,   351,    -1,   351,    -1,   352,
+      -1,   353,    -1,   354,    -1,     1,   214,    -1,    89,   217,
+     117,   214,    -1,   205,   217,   117,   214,    -1,    -1,   150,
+     355,   217,   356,   214,    -1,   356,   218,   357,    -1,   357,
+      -1,    64,    -1,   204,    -1,   173,    -1,   193,    -1,   210,
+      -1,   196,    -1,   135,    -1,   195,    -1,   179,    -1,   164,
+      -1,    -1,   149,   359,   216,   360,   215,   214,    -1,   360,
+     361,    -1,   361,    -1,   362,    -1,   363,    -1,     1,   214,
+      -1,    89,   217,   117,   214,    -1,    -1,   150,   364,   217,
+     365,   214,    -1,   365,   218,   366,    -1,   366,    -1,    64,
+      -1,   204,    -1,   173,    -1,   193,    -1,   210,    -1,   196,
+      -1,   135,    -1,   195,    -1,   179,    -1,   164,    -1,    -1,
+      18,   368,   216,   369,   215,   214,    -1,   369,   370,    -1,
+     370,    -1,   371,    -1,   372,    -1,   373,    -1,   374,    -1,
+     375,    -1,   377,    -1,   376,    -1,   386,    -1,   378,    -1,
+     383,    -1,   384,    -1,   385,    -1,   382,    -1,     1,   214,
+      -1,    89,   217,   117,   214,    -1,    56,   217,   117,   214,
+      -1,   208,   217,   117,   214,    -1,   143,   217,   117,   214,
+      -1,     3,   217,   117,   214,    -1,   116,   217,    99,   214,
+      -1,     5,   217,   177,   214,    -1,     5,   217,   178,   214,
+      -1,    -1,    36,   379,   217,   380,   214,    -1,   380,   218,
+     381,    -1,   381,    -1,     8,    -1,   190,    -1,    32,   217,
+     159,   214,    -1,    58,   217,   117,   214,    -1,    68,   217,
+     117,   214,    -1,    17,   217,   117,   214,    -1,   170,   217,
+     117,   214,    -1,    -1,    62,   388,   216,   393,   215,   214,
+      -1,    -1,   150,   390,   217,   391,   214,    -1,   391,   218,
+     392,    -1,   392,    -1,   122,    -1,   393,   394,    -1,   394,
+      -1,   395,    -1,   396,    -1,   389,    -1,     1,    -1,   205,
+     217,   117,   214,    -1,   119,   217,   117,   214,    -1,    -1,
+      23,   398,   216,   399,   215,   214,    -1,   399,   400,    -1,
+     400,    -1,   401,    -1,   402,    -1,     1,    -1,    61,   217,
+     117,   214,    -1,   119,   217,   117,   214,    -1,    34,   216,
+     404,   215,   214,    -1,   404,   405,    -1,   405,    -1,   406,
+      -1,     1,    -1,    61,   217,   117,   214,    -1,    -1,    38,
+     408,   216,   413,   215,   214,    -1,    -1,   150,   410,   217,
+     411,   214,    -1,   411,   218,   412,    -1,   412,    -1,   122,
+      -1,   413,   414,    -1,   414,    -1,   415,    -1,   416,    -1,
+     409,    -1,     1,    -1,    89,   217,   117,   214,    -1,   119,
+     217,   117,   214,    -1,    39,   216,   418,   215,   214,    -1,
+     418,   419,    -1,   419,    -1,   428,    -1,   429,    -1,   431,
+      -1,   432,    -1,   433,    -1,   434,    -1,   435,    -1,   436,
+      -1,   437,    -1,   438,    -1,   427,    -1,   440,    -1,   441,
+      -1,   456,    -1,   443,    -1,   445,    -1,   447,    -1,   446,
+      -1,   450,    -1,   444,    -1,   451,    -1,   452,    -1,   453,
+      -1,   454,    -1,   455,    -1,   468,    -1,   457,    -1,   458,
+      -1,   459,    -1,   464,    -1,   448,    -1,   449,    -1,   474,
+      -1,   472,    -1,   473,    -1,   430,    -1,   463,    -1,   439,
+      -1,   461,    -1,   462,    -1,   426,    -1,   421,    -1,   422,
+      -1,   423,    -1,   424,    -1,   425,    -1,   442,    -1,   420,
+      -1,   460,    -1,     1,    -1,    83,   217,    99,   214,    -1,
+      42,   217,   159,   214,    -1,    41,   217,   223,   214,    -1,
+      44,   217,   223,   214,    -1,    45,   217,    99,   214,    -1,
+      46,   217,    99,   214,    -1,   147,   217,   159,   214,    -1,
+      63,   217,   223,   214,    -1,    55,   217,   159,   214,    -1,
+      59,   217,   159,   214,    -1,    28,   217,   159,   214,    -1,
+      35,   217,   159,   214,    -1,     6,   217,   159,   214,    -1,
+      80,   217,   223,   214,    -1,    79,   217,    99,   214,    -1,
+      72,   217,    99,   214,    -1,     7,   217,   223,   214,    -1,
+     162,   217,   223,   214,    -1,   161,   217,   223,   214,    -1,
+      50,   217,    99,   214,    -1,    60,   217,   159,   214,    -1,
+     211,   217,   159,   214,    -1,   154,   217,   159,   214,    -1,
+     157,   217,   159,   214,    -1,   158,   217,   159,   214,    -1,
+     156,   217,   159,   214,    -1,   156,   217,   160,   214,    -1,
+     155,   217,   159,   214,    -1,   155,   217,   160,   214,    -1,
+     110,   217,   223,   214,    -1,    12,   217,   223,   214,    -1,
+     103,   217,   159,   214,    -1,   111,   217,   223,   214,    -1,
+     151,   217,   159,   214,    -1,    97,   217,   159,   214,    -1,
+     203,   217,   159,   214,    -1,   105,   217,   159,   214,    -1,
+      84,   217,   117,   214,    -1,    29,   217,    99,   214,    -1,
+      82,   217,    99,   214,    -1,   206,   217,   159,   214,    -1,
+      30,   217,   117,   214,    -1,   201,   217,   117,   214,    -1,
+     114,   217,   159,   214,    -1,    26,   217,   159,   214,    -1,
+     202,   217,   223,   214,    -1,    -1,   107,   465,   217,   466,
+     214,    -1,   466,   218,   467,    -1,   467,    -1,   165,    -1,
+     168,    -1,   169,    -1,   171,    -1,   172,    -1,   175,    -1,
+      51,    -1,   188,    -1,   181,    -1,   184,    -1,   192,    -1,
+     189,    -1,   174,    -1,   182,    -1,   186,    -1,   176,    -1,
+     198,    -1,   166,    -1,   167,    -1,   179,    -1,    -1,   104,
+     469,   217,   470,   214,    -1,   470,   218,   471,    -1,   471,
+      -1,   165,    -1,   168,    -1,   169,    -1,   171,    -1,   172,
+      -1,   175,    -1,   188,    -1,    51,    -1,   181,    -1,   184,
+      -1,   192,    -1,   189,    -1,   174,    -1,   182,    -1,   186,
+      -1,   176,    -1,   198,    -1,   166,    -1,   167,    -1,   179,
+      -1,    85,   217,    99,   214,    -1,    86,   217,    99,   214,
+      -1,    20,   217,    99,   214,    -1,    14,   216,   476,   215,
+     214,    -1,   476,   477,    -1,   477,    -1,   485,    -1,   480,
+      -1,   481,    -1,   482,    -1,   483,    -1,   484,    -1,   486,
+      -1,   487,    -1,   488,    -1,   479,    -1,   489,    -1,   490,
+      -1,   491,    -1,   478,    -1,     1,    -1,    27,   217,   159,
+     214,    -1,   126,   217,   159,   214,    -1,    66,   217,   223,
+     214,    -1,    67,   217,   223,   214,    -1,    75,   217,    99,
+     214,    -1,    74,   217,    99,   214,    -1,   118,   217,   159,
+     214,    -1,    73,   217,    99,   214,    -1,    22,   217,    99,
+     214,    -1,    21,   217,    99,   214,    -1,    95,   217,   159,
+     214,    -1,    96,   217,   159,   214,    -1,   108,   217,    99,
+     214,    -1,   109,   217,   223,   214,    -1,   144,   216,   493,
+     215,   214,    -1,   493,   494,    -1,   494,    -1,   495,    -1,
+     496,    -1,   498,    -1,   499,    -1,   497,    -1,   500,    -1,
+       1,    -1,    37,   217,   159,   214,    -1,    54,   217,   159,
+     214,    -1,    52,   217,   117,   214,    -1,    69,   217,   223,
+     214,    -1,    51,   217,   159,   214,    -1,    53,   217,   159,
+     214,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   329,   329,   330,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,   354,   358,   358,   359,   363,
-     367,   371,   375,   379,   385,   385,   386,   387,   388,   389,
-     396,   399,   399,   400,   400,   400,   402,   408,   415,   417,
-     417,   418,   418,   419,   419,   420,   420,   421,   421,   422,
-     422,   423,   423,   424,   424,   425,   426,   429,   430,   432,
-     432,   433,   439,   447,   447,   448,   454,   462,   501,   560,
-     588,   596,   611,   626,   635,   649,   658,   686,   716,   739,
-     748,   750,   750,   751,   751,   752,   752,   754,   763,   772,
-     784,   785,   785,   787,   787,   788,   790,   797,   797,   807,
-     808,   810,   810,   811,   811,   813,   818,   821,   827,   826,
-     832,   832,   833,   837,   841,   845,   849,   853,   857,   868,
-     867,   959,   959,   960,   960,   960,   961,   961,   961,   962,
-     962,   962,   964,   973,  1010,  1022,  1033,  1075,  1085,  1084,
-    1090,  1090,  1091,  1095,  1099,  1103,  1107,  1111,  1115,  1119,
-    1123,  1127,  1131,  1135,  1139,  1143,  1147,  1151,  1155,  1159,
-    1163,  1167,  1174,  1173,  1179,  1179,  1180,  1184,  1188,  1192,
-    1196,  1200,  1204,  1208,  1212,  1216,  1220,  1224,  1228,  1232,
-    1236,  1240,  1244,  1248,  1252,  1263,  1262,  1308,  1308,  1309,
-    1310,  1310,  1311,  1312,  1313,  1314,  1315,  1316,  1317,  1318,
-    1319,  1320,  1320,  1321,  1323,  1332,  1338,  1344,  1350,  1356,
-    1362,  1368,  1374,  1380,  1386,  1393,  1399,  1405,  1415,  1414,
-    1431,  1430,  1435,  1435,  1436,  1440,  1444,  1452,  1452,  1453,
-    1453,  1453,  1453,  1453,  1455,  1455,  1457,  1457,  1459,  1473,
-    1493,  1502,  1515,  1514,  1577,  1577,  1578,  1578,  1578,  1578,
-    1579,  1579,  1579,  1580,  1580,  1582,  1617,  1630,  1639,  1651,
-    1650,  1654,  1654,  1655,  1659,  1663,  1667,  1671,  1675,  1679,
-    1683,  1687,  1693,  1712,  1722,  1736,  1735,  1751,  1751,  1752,
-    1752,  1752,  1752,  1754,  1763,  1778,  1791,  1793,  1793,  1794,
-    1794,  1796,  1812,  1811,  1826,  1826,  1827,  1827,  1827,  1827,
-    1829,  1838,  1861,  1860,  1866,  1866,  1867,  1871,  1875,  1879,
-    1883,  1887,  1891,  1895,  1899,  1903,  1913,  1912,  1928,  1928,
-    1929,  1929,  1929,  1931,  1938,  1937,  1943,  1943,  1944,  1948,
-    1952,  1956,  1960,  1964,  1968,  1972,  1976,  1980,  1990,  1989,
-    2038,  2038,  2039,  2039,  2039,  2040,  2040,  2041,  2041,  2041,
-    2042,  2042,  2042,  2043,  2043,  2044,  2046,  2055,  2064,  2090,
-    2108,  2126,  2132,  2136,  2145,  2144,  2148,  2148,  2149,  2153,
-    2159,  2170,  2181,  2192,  2201,  2220,  2219,  2283,  2282,  2286,
-    2286,  2287,  2293,  2293,  2294,  2294,  2294,  2294,  2296,  2315,
-    2325,  2324,  2347,  2347,  2348,  2348,  2348,  2350,  2356,  2365,
-    2367,  2367,  2368,  2368,  2370,  2389,  2388,  2435,  2434,  2438,
-    2438,  2439,  2445,  2445,  2446,  2446,  2446,  2446,  2448,  2454,
-    2463,  2466,  2466,  2467,  2467,  2468,  2468,  2469,  2469,  2470,
-    2470,  2471,  2471,  2472,  2473,  2474,  2474,  2475,  2475,  2476,
-    2476,  2477,  2477,  2478,  2478,  2479,  2479,  2480,  2481,  2481,
-    2482,  2482,  2483,  2483,  2484,  2484,  2485,  2485,  2486,  2487,
-    2487,  2488,  2489,  2490,  2490,  2491,  2491,  2492,  2493,  2494,
-    2495,  2495,  2496,  2499,  2504,  2510,  2516,  2522,  2527,  2532,
-    2537,  2542,  2547,  2552,  2557,  2562,  2567,  2572,  2577,  2582,
-    2587,  2592,  2598,  2609,  2614,  2619,  2624,  2629,  2634,  2637,
-    2642,  2645,  2650,  2655,  2660,  2665,  2670,  2675,  2680,  2685,
-    2690,  2701,  2706,  2711,  2716,  2725,  2734,  2739,  2744,  2750,
-    2749,  2754,  2754,  2755,  2758,  2761,  2764,  2767,  2770,  2773,
-    2776,  2779,  2782,  2785,  2788,  2791,  2794,  2797,  2800,  2803,
-    2806,  2809,  2812,  2818,  2817,  2822,  2822,  2823,  2826,  2829,
-    2832,  2835,  2838,  2841,  2844,  2847,  2850,  2853,  2856,  2859,
-    2862,  2865,  2868,  2871,  2874,  2877,  2880,  2885,  2890,  2895,
-    2904,  2907,  2907,  2908,  2909,  2909,  2910,  2910,  2911,  2911,
-    2912,  2913,  2913,  2914,  2915,  2915,  2916,  2916,  2918,  2923,
-    2928,  2933,  2938,  2943,  2948,  2953,  2958,  2963,  2968,  2973,
-    2978,  2983,  2991,  2994,  2994,  2995,  2995,  2996,  2997,  2997,
-    2998,  2999,  3001,  3007,  3013,  3022,  3036,  3042
+       0,   328,   328,   329,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,   357,   357,   358,   362,
+     366,   370,   374,   378,   384,   384,   385,   386,   387,   388,
+     395,   398,   398,   399,   399,   399,   401,   407,   414,   416,
+     416,   417,   417,   418,   418,   419,   419,   420,   420,   421,
+     421,   422,   422,   423,   423,   424,   425,   428,   429,   431,
+     431,   432,   438,   446,   446,   447,   453,   461,   500,   559,
+     587,   595,   610,   625,   634,   648,   657,   685,   715,   738,
+     747,   749,   749,   750,   750,   751,   751,   753,   762,   771,
+     783,   784,   784,   786,   786,   787,   789,   796,   796,   806,
+     807,   809,   809,   810,   810,   812,   817,   820,   826,   825,
+     831,   831,   832,   836,   840,   844,   848,   852,   856,   867,
+     866,   958,   958,   959,   959,   959,   960,   960,   960,   961,
+     961,   961,   963,   972,  1009,  1021,  1032,  1074,  1084,  1083,
+    1089,  1089,  1090,  1094,  1098,  1102,  1106,  1110,  1114,  1118,
+    1122,  1126,  1130,  1134,  1138,  1142,  1146,  1150,  1154,  1158,
+    1162,  1166,  1173,  1172,  1178,  1178,  1179,  1183,  1187,  1191,
+    1195,  1199,  1203,  1207,  1211,  1215,  1219,  1223,  1227,  1231,
+    1235,  1239,  1243,  1247,  1251,  1262,  1261,  1307,  1307,  1308,
+    1309,  1309,  1310,  1311,  1312,  1313,  1314,  1315,  1316,  1317,
+    1318,  1318,  1319,  1321,  1330,  1336,  1342,  1348,  1354,  1360,
+    1366,  1372,  1378,  1385,  1391,  1397,  1407,  1406,  1423,  1422,
+    1427,  1427,  1428,  1432,  1436,  1444,  1444,  1445,  1445,  1445,
+    1445,  1445,  1447,  1447,  1449,  1449,  1451,  1465,  1485,  1494,
+    1507,  1506,  1569,  1569,  1570,  1570,  1570,  1570,  1571,  1571,
+    1571,  1572,  1572,  1574,  1609,  1622,  1631,  1643,  1642,  1646,
+    1646,  1647,  1651,  1655,  1659,  1663,  1667,  1671,  1675,  1679,
+    1685,  1704,  1714,  1728,  1727,  1743,  1743,  1744,  1744,  1744,
+    1744,  1746,  1755,  1770,  1783,  1785,  1785,  1786,  1786,  1788,
+    1804,  1803,  1818,  1818,  1819,  1819,  1819,  1819,  1821,  1830,
+    1853,  1852,  1858,  1858,  1859,  1863,  1867,  1871,  1875,  1879,
+    1883,  1887,  1891,  1895,  1905,  1904,  1920,  1920,  1921,  1921,
+    1921,  1923,  1930,  1929,  1935,  1935,  1936,  1940,  1944,  1948,
+    1952,  1956,  1960,  1964,  1968,  1972,  1982,  1981,  2030,  2030,
+    2031,  2031,  2031,  2032,  2032,  2033,  2033,  2033,  2034,  2034,
+    2034,  2035,  2035,  2036,  2038,  2047,  2056,  2082,  2100,  2118,
+    2124,  2128,  2137,  2136,  2140,  2140,  2141,  2145,  2151,  2162,
+    2173,  2184,  2193,  2212,  2211,  2275,  2274,  2278,  2278,  2279,
+    2285,  2285,  2286,  2286,  2286,  2286,  2288,  2307,  2317,  2316,
+    2339,  2339,  2340,  2340,  2340,  2342,  2348,  2357,  2359,  2359,
+    2360,  2360,  2362,  2381,  2380,  2427,  2426,  2430,  2430,  2431,
+    2437,  2437,  2438,  2438,  2438,  2438,  2440,  2446,  2455,  2458,
+    2458,  2459,  2459,  2460,  2460,  2461,  2461,  2462,  2462,  2463,
+    2463,  2464,  2465,  2466,  2466,  2467,  2467,  2468,  2468,  2469,
+    2469,  2470,  2470,  2471,  2471,  2472,  2473,  2473,  2474,  2474,
+    2475,  2475,  2476,  2476,  2477,  2477,  2478,  2479,  2479,  2480,
+    2481,  2482,  2482,  2483,  2483,  2484,  2485,  2486,  2487,  2487,
+    2488,  2491,  2496,  2502,  2508,  2514,  2519,  2524,  2529,  2534,
+    2539,  2544,  2549,  2554,  2559,  2564,  2569,  2574,  2579,  2584,
+    2590,  2601,  2606,  2611,  2616,  2621,  2626,  2629,  2634,  2637,
+    2642,  2647,  2652,  2657,  2662,  2667,  2672,  2677,  2682,  2693,
+    2698,  2703,  2708,  2717,  2726,  2731,  2736,  2742,  2741,  2746,
+    2746,  2747,  2750,  2753,  2756,  2759,  2762,  2765,  2768,  2771,
+    2774,  2777,  2780,  2783,  2786,  2789,  2792,  2795,  2798,  2801,
+    2804,  2810,  2809,  2814,  2814,  2815,  2818,  2821,  2824,  2827,
+    2830,  2833,  2836,  2839,  2842,  2845,  2848,  2851,  2854,  2857,
+    2860,  2863,  2866,  2869,  2872,  2877,  2882,  2887,  2896,  2899,
+    2899,  2900,  2901,  2901,  2902,  2902,  2903,  2903,  2904,  2905,
+    2905,  2906,  2907,  2907,  2908,  2908,  2910,  2915,  2920,  2925,
+    2930,  2935,  2940,  2945,  2950,  2955,  2960,  2965,  2970,  2975,
+    2983,  2986,  2986,  2987,  2987,  2988,  2989,  2989,  2990,  2991,
+    2993,  2999,  3005,  3014,  3028,  3034
 };
 #endif
 
@@ -1310,8 +1308,8 @@ static const char *const yytname[] =
   "OPERS_BYPASS_CALLERID", "OPER_ONLY_UMODES", "OPER_PASS_RESV",
   "OPER_SPY_T", "OPER_UMODES", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME",
   "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
-  "PING_TIME", "PING_WARNING", "PORT", "QSTRING", "QUIET_ON_BAN", "REASON",
-  "REDIRPORT", "REDIRSERV", "REGEX_T", "REHASH", "REMOTE", "REMOTEBAN",
+  "PING_TIME", "PORT", "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT",
+  "REDIRSERV", "REGEX_T", "REHASH", "REMOTE", "REMOTEBAN",
   "RESTRICT_CHANNELS", "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE",
   "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", "T_SSL_CLIENT_METHOD",
   "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT",
@@ -1353,9 +1351,9 @@ static const char *const yytname[] =
   "oper_umodes", "$@4", "oper_umodes_items", "oper_umodes_item",
   "oper_flags", "$@5", "oper_flags_items", "oper_flags_item",
   "class_entry", "$@6", "class_items", "class_item", "class_name",
-  "class_ping_time", "class_ping_warning", "class_number_per_ip",
-  "class_connectfreq", "class_max_number", "class_max_global",
-  "class_max_local", "class_max_ident", "class_sendq", "class_recvq",
+  "class_ping_time", "class_number_per_ip", "class_connectfreq",
+  "class_max_number", "class_max_global", "class_max_local",
+  "class_max_ident", "class_sendq", "class_recvq",
   "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
   "class_number_per_cidr", "listen_entry", "$@7", "listen_flags", "$@8",
   "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
@@ -1447,76 +1445,76 @@ static const yytype_uint16 yytoknum[] =
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
      455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,    59,   125,   123,    61,    44
+     465,   466,   467,   468,    59,   125,   123,    61,    44
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   220,   221,   221,   222,   222,   222,   222,   222,   222,
-     222,   222,   222,   222,   222,   222,   222,   222,   222,   222,
-     222,   222,   222,   222,   222,   222,   223,   223,   224,   224,
-     224,   224,   224,   224,   225,   225,   226,   226,   226,   226,
-     227,   228,   228,   229,   229,   229,   230,   231,   232,   233,
-     233,   234,   234,   234,   234,   234,   234,   234,   234,   234,
-     234,   234,   234,   234,   234,   234,   234,   235,   236,   237,
-     237,   238,   238,   239,   239,   240,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   255,   256,   256,   256,   256,   257,   258,   259,
-     260,   261,   261,   262,   262,   262,   263,   265,   264,   266,
-     266,   267,   267,   267,   267,   268,   269,   269,   271,   270,
-     272,   272,   273,   273,   273,   273,   273,   273,   273,   275,
-     274,   276,   276,   277,   277,   277,   277,   277,   277,   277,
-     277,   277,   278,   279,   280,   281,   282,   283,   285,   284,
-     286,   286,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,   287,   289,   288,   290,   290,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   293,   292,   294,   294,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   311,   310,
-     313,   312,   314,   314,   315,   315,   315,   316,   316,   317,
-     317,   317,   317,   317,   319,   318,   320,   320,   321,   321,
-     322,   323,   325,   324,   326,   326,   327,   327,   327,   327,
-     327,   327,   327,   327,   327,   328,   329,   330,   331,   333,
-     332,   334,   334,   335,   335,   335,   335,   335,   335,   335,
-     335,   335,   336,   337,   338,   340,   339,   341,   341,   342,
-     342,   342,   342,   343,   344,   345,   346,   347,   347,   348,
-     348,   349,   351,   350,   352,   352,   353,   353,   353,   353,
-     354,   355,   357,   356,   358,   358,   359,   359,   359,   359,
-     359,   359,   359,   359,   359,   359,   361,   360,   362,   362,
-     363,   363,   363,   364,   366,   365,   367,   367,   368,   368,
-     368,   368,   368,   368,   368,   368,   368,   368,   370,   369,
-     371,   371,   372,   372,   372,   372,   372,   372,   372,   372,
-     372,   372,   372,   372,   372,   372,   373,   374,   375,   376,
-     377,   378,   379,   379,   381,   380,   382,   382,   383,   383,
-     384,   385,   386,   387,   388,   390,   389,   392,   391,   393,
-     393,   394,   395,   395,   396,   396,   396,   396,   397,   398,
-     400,   399,   401,   401,   402,   402,   402,   403,   404,   405,
-     406,   406,   407,   407,   408,   410,   409,   412,   411,   413,
-     413,   414,   415,   415,   416,   416,   416,   416,   417,   418,
-     419,   420,   420,   421,   421,   421,   421,   421,   421,   421,
-     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
-     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
-     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
-     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
-     421,   421,   421,   422,   423,   424,   425,   426,   427,   428,
+       0,   219,   220,   220,   221,   221,   221,   221,   221,   221,
+     221,   221,   221,   221,   221,   221,   221,   221,   221,   221,
+     221,   221,   221,   221,   221,   221,   222,   222,   223,   223,
+     223,   223,   223,   223,   224,   224,   225,   225,   225,   225,
+     226,   227,   227,   228,   228,   228,   229,   230,   231,   232,
+     232,   233,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   233,   233,   233,   234,   235,   236,
+     236,   237,   237,   238,   238,   239,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   254,   255,   255,   255,   255,   256,   257,   258,
+     259,   260,   260,   261,   261,   261,   262,   264,   263,   265,
+     265,   266,   266,   266,   266,   267,   268,   268,   270,   269,
+     271,   271,   272,   272,   272,   272,   272,   272,   272,   274,
+     273,   275,   275,   276,   276,   276,   276,   276,   276,   276,
+     276,   276,   277,   278,   279,   280,   281,   282,   284,   283,
+     285,   285,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   288,   287,   289,   289,   290,   290,   290,   290,
+     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
+     290,   290,   290,   290,   290,   292,   291,   293,   293,   294,
+     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
+     294,   294,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   309,   308,   311,   310,
+     312,   312,   313,   313,   313,   314,   314,   315,   315,   315,
+     315,   315,   317,   316,   318,   318,   319,   319,   320,   321,
+     323,   322,   324,   324,   325,   325,   325,   325,   325,   325,
+     325,   325,   325,   326,   327,   328,   329,   331,   330,   332,
+     332,   333,   333,   333,   333,   333,   333,   333,   333,   333,
+     334,   335,   336,   338,   337,   339,   339,   340,   340,   340,
+     340,   341,   342,   343,   344,   345,   345,   346,   346,   347,
+     349,   348,   350,   350,   351,   351,   351,   351,   352,   353,
+     355,   354,   356,   356,   357,   357,   357,   357,   357,   357,
+     357,   357,   357,   357,   359,   358,   360,   360,   361,   361,
+     361,   362,   364,   363,   365,   365,   366,   366,   366,   366,
+     366,   366,   366,   366,   366,   366,   368,   367,   369,   369,
+     370,   370,   370,   370,   370,   370,   370,   370,   370,   370,
+     370,   370,   370,   370,   371,   372,   373,   374,   375,   376,
+     377,   377,   379,   378,   380,   380,   381,   381,   382,   383,
+     384,   385,   386,   388,   387,   390,   389,   391,   391,   392,
+     393,   393,   394,   394,   394,   394,   395,   396,   398,   397,
+     399,   399,   400,   400,   400,   401,   402,   403,   404,   404,
+     405,   405,   406,   408,   407,   410,   409,   411,   411,   412,
+     413,   413,   414,   414,   414,   414,   415,   416,   417,   418,
+     418,   419,   419,   419,   419,   419,   419,   419,   419,   419,
+     419,   419,   419,   419,   419,   419,   419,   419,   419,   419,
+     419,   419,   419,   419,   419,   419,   419,   419,   419,   419,
+     419,   419,   419,   419,   419,   419,   419,   419,   419,   419,
+     419,   419,   419,   419,   419,   419,   419,   419,   419,   419,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
      429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-     439,   440,   441,   442,   443,   444,   445,   446,   447,   447,
-     448,   448,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,   467,
-     466,   468,   468,   469,   469,   469,   469,   469,   469,   469,
-     469,   469,   469,   469,   469,   469,   469,   469,   469,   469,
-     469,   469,   469,   471,   470,   472,   472,   473,   473,   473,
-     473,   473,   473,   473,   473,   473,   473,   473,   473,   473,
-     473,   473,   473,   473,   473,   473,   473,   474,   475,   476,
-     477,   478,   478,   479,   479,   479,   479,   479,   479,   479,
-     479,   479,   479,   479,   479,   479,   479,   479,   480,   481,
+     439,   440,   441,   442,   443,   444,   445,   445,   446,   446,
+     447,   448,   449,   450,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,   465,   464,   466,
+     466,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     467,   469,   468,   470,   470,   471,   471,   471,   471,   471,
+     471,   471,   471,   471,   471,   471,   471,   471,   471,   471,
+     471,   471,   471,   471,   471,   472,   473,   474,   475,   476,
+     476,   477,   477,   477,   477,   477,   477,   477,   477,   477,
+     477,   477,   477,   477,   477,   477,   478,   479,   480,   481,
      482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
-     492,   493,   494,   495,   495,   496,   496,   496,   496,   496,
-     496,   496,   497,   498,   499,   500,   501,   502
+     492,   493,   493,   494,   494,   494,   494,   494,   494,   494,
+     495,   496,   497,   498,   499,   500
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1543,48 +1541,48 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     0,     6,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     0,     6,
-       0,     5,     3,     1,     1,     1,     1,     2,     1,     1,
-       1,     1,     1,     2,     0,     5,     3,     1,     1,     3,
-       4,     4,     0,     6,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     4,     4,     4,     4,     0,
-       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     4,     4,     4,     0,     6,     2,     1,     1,
-       1,     1,     2,     4,     4,     4,     5,     2,     1,     1,
-       1,     4,     0,     6,     2,     1,     1,     1,     1,     2,
-       4,     4,     0,     5,     3,     1,     1,     1,     1,     1,
+       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     0,     6,     0,     5,
+       3,     1,     1,     1,     1,     2,     1,     1,     1,     1,
+       1,     2,     0,     5,     3,     1,     1,     3,     4,     4,
+       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     4,     4,     4,     4,     0,     5,     3,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       4,     4,     4,     0,     6,     2,     1,     1,     1,     1,
+       2,     4,     4,     4,     5,     2,     1,     1,     1,     4,
+       0,     6,     2,     1,     1,     1,     1,     2,     4,     4,
+       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     6,     2,     1,     1,     1,
+       2,     4,     0,     5,     3,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     0,     6,     2,     1,
-       1,     1,     2,     4,     0,     5,     3,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     6,
-       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     4,     4,     4,     4,
-       4,     4,     4,     4,     0,     5,     3,     1,     1,     1,
-       4,     4,     4,     4,     4,     0,     6,     0,     5,     3,
-       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
-       0,     6,     2,     1,     1,     1,     1,     4,     4,     5,
-       2,     1,     1,     1,     4,     0,     6,     0,     5,     3,
-       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
-       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
+       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
+       4,     4,     4,     0,     6,     0,     5,     3,     1,     1,
+       2,     1,     1,     1,     1,     1,     4,     4,     0,     6,
+       2,     1,     1,     1,     1,     4,     4,     5,     2,     1,
+       1,     1,     4,     0,     6,     0,     5,     3,     1,     1,
+       2,     1,     1,     1,     1,     1,     4,     4,     5,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     4,     4,     4,     4,     4,     4,     4,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     4,     4,     4,     4,     4,     4,     4,     4,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     0,
-       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     5,     3,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
-       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
+       1,     0,     5,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     4,     4,     4,     5,     2,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     4,     4,     4,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     4,     4,     4,     4,     4,     4
+       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       4,     4,     4,     4,     4,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1592,327 +1590,327 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,     0,     0,     0,   195,   348,   400,     0,
-     415,     0,   252,   385,   228,     0,     0,   129,   285,     0,
-       0,   302,   326,     0,     3,    23,    11,     4,     5,     6,
+       2,     0,     1,     0,     0,     0,   195,   346,   398,     0,
+     413,     0,   250,   383,   226,     0,     0,   129,   283,     0,
+       0,   300,   324,     0,     3,    23,    11,     4,     5,     6,
        8,     9,    10,    13,    14,    15,    16,    17,    18,    19,
       20,    22,    21,     7,    12,    24,    25,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    92,    93,    95,    94,   597,     0,     0,     0,
+       0,     0,    92,    93,    95,    94,   595,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   582,   596,   592,   584,   585,   586,   587,   588,
-     583,   589,   590,   591,   593,   594,   595,     0,     0,     0,
-     413,     0,     0,   411,   412,     0,   482,     0,     0,     0,
+       0,     0,   580,   594,   590,   582,   583,   584,   585,   586,
+     581,   587,   588,   589,   591,   592,   593,     0,     0,     0,
+     411,     0,     0,   409,   410,     0,   480,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   553,     0,   529,     0,
+       0,     0,     0,     0,     0,     0,   551,     0,   527,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   432,   480,   474,
-     475,   476,   477,   478,   473,   443,   433,   434,   468,   435,
-     436,   437,   438,   439,   440,   441,   442,   470,   444,   445,
-     479,   447,   452,   448,   450,   449,   463,   464,   451,   453,
-     454,   455,   456,   457,   446,   459,   460,   461,   481,   471,
-     472,   469,   462,   458,   466,   467,   465,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   430,   478,   472,
+     473,   474,   475,   476,   471,   441,   431,   432,   466,   433,
+     434,   435,   436,   437,   438,   439,   440,   468,   442,   443,
+     477,   445,   450,   446,   448,   447,   461,   462,   449,   451,
+     452,   453,   454,   455,   444,   457,   458,   459,   479,   469,
+     470,   467,   460,   456,   464,   465,   463,     0,     0,     0,
        0,     0,     0,   102,   103,   104,     0,     0,     0,     0,
-       0,    42,    43,    44,     0,     0,   621,     0,     0,     0,
-       0,     0,     0,     0,   614,   615,   616,   619,   617,   618,
-     620,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    42,    43,    44,     0,     0,   619,     0,     0,     0,
+       0,     0,     0,     0,   612,   613,   614,   617,   615,   616,
+     618,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    50,    63,
       64,    62,    59,    58,    65,    51,    61,    54,    55,    56,
-      52,    60,    57,    53,     0,     0,   300,     0,     0,   298,
-     299,    96,     0,     0,     0,     0,    91,     0,     0,     0,
+      52,    60,    57,    53,     0,     0,   298,     0,     0,   296,
+     297,    96,     0,     0,     0,     0,    91,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   581,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   198,
-     199,   202,   203,   205,   206,   207,   208,   209,   210,   211,
-     212,   200,   201,   204,     0,     0,     0,     0,     0,   374,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   351,
-     352,   353,   354,   355,   356,   358,   357,   360,   364,   361,
-     362,   363,   359,   406,     0,     0,     0,   403,   404,   405,
-       0,     0,   410,   427,     0,     0,   417,   426,     0,   423,
-     424,   425,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   579,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   198,   199,
+     202,   204,   205,   206,   207,   208,   209,   210,   211,   200,
+     201,   203,     0,     0,     0,     0,     0,   372,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   349,   350,   351,
+     352,   353,   354,   356,   355,   358,   362,   359,   360,   361,
+     357,   404,     0,     0,     0,   401,   402,   403,     0,     0,
+     408,   425,     0,     0,   415,   424,     0,   421,   422,   423,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   431,     0,     0,     0,   269,     0,     0,     0,
-       0,     0,     0,   255,   256,   257,   258,   263,   259,   260,
-     261,   262,   397,     0,   387,     0,   396,     0,   393,   394,
-     395,     0,   230,     0,     0,     0,   240,     0,   238,   239,
-     241,   242,   105,     0,     0,   101,     0,    45,     0,     0,
-       0,    41,     0,     0,     0,   172,     0,     0,     0,   148,
-       0,     0,   132,   133,   134,   135,   138,   139,   137,   136,
-     140,     0,     0,     0,     0,     0,   288,   289,   290,   291,
-       0,     0,     0,     0,     0,     0,     0,   613,    66,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    49,     0,     0,   312,     0,
-       0,   305,   306,   307,   308,     0,     0,   334,     0,   329,
-     330,   331,     0,     0,   297,     0,     0,     0,    90,     0,
-       0,     0,    26,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   580,   213,     0,     0,     0,     0,
+     429,     0,     0,     0,   267,     0,     0,     0,     0,     0,
+       0,   253,   254,   255,   256,   261,   257,   258,   259,   260,
+     395,     0,   385,     0,   394,     0,   391,   392,   393,     0,
+     228,     0,     0,     0,   238,     0,   236,   237,   239,   240,
+     105,     0,     0,   101,     0,    45,     0,     0,     0,    41,
+       0,     0,     0,   172,     0,     0,     0,   148,     0,     0,
+     132,   133,   134,   135,   138,   139,   137,   136,   140,     0,
+       0,     0,     0,     0,   286,   287,   288,   289,     0,     0,
+       0,     0,     0,     0,     0,   611,    66,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   197,   365,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   350,     0,     0,
-       0,   402,     0,   409,     0,     0,     0,     0,   422,     0,
+       0,     0,     0,    49,     0,     0,   310,     0,     0,   303,
+     304,   305,   306,     0,     0,   332,     0,   327,   328,   329,
+       0,     0,   295,     0,     0,     0,    90,     0,     0,     0,
+      26,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   578,   212,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   197,   363,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   348,     0,     0,     0,   400,     0,
+     407,     0,     0,     0,     0,   420,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     430,   264,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   254,     0,     0,     0,     0,   392,   243,     0,     0,
-       0,     0,     0,   237,     0,   100,     0,     0,     0,    40,
-     141,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     131,   292,     0,     0,     0,     0,   287,     0,     0,     0,
-       0,     0,     0,   612,     0,     0,     0,     0,     0,     0,
-       0,     0,    71,    72,     0,    70,    75,    76,     0,    74,
-       0,     0,     0,     0,     0,    48,   309,     0,     0,     0,
-       0,   304,   332,     0,     0,     0,   328,     0,   296,    99,
-      98,    97,   607,   606,   598,    26,    26,    26,    26,    26,
-      28,    27,   600,   601,   605,   603,   602,   608,   609,   610,
-     611,   604,   599,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    34,     0,     0,   196,     0,
+       0,     0,     0,     0,     0,     0,     0,   428,   262,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   252,     0,
+       0,     0,     0,   390,   241,     0,     0,     0,     0,     0,
+     235,     0,   100,     0,     0,     0,    40,   141,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   131,   290,     0,
+       0,     0,     0,   285,     0,     0,     0,     0,     0,     0,
+     610,     0,     0,     0,     0,     0,     0,     0,     0,    71,
+      72,     0,    70,    75,    76,     0,    74,     0,     0,     0,
+       0,     0,    48,   307,     0,     0,     0,     0,   302,   330,
+       0,     0,     0,   326,     0,   294,    99,    98,    97,   605,
+     604,   596,    26,    26,    26,    26,    26,    28,    27,   598,
+     599,   603,   601,   600,   606,   607,   608,   609,   602,   597,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   349,     0,     0,   401,   414,     0,     0,
-       0,   416,   495,   499,   513,   579,   527,   493,   521,   524,
-     494,   485,   484,   486,   487,   488,   502,   491,   492,   503,
-     490,   498,   497,   496,   522,   483,   520,   577,   578,   517,
-     514,   564,   557,   574,   575,   558,   559,   560,   561,   569,
-     562,   572,   576,   565,   570,   566,   571,   563,   568,   567,
-     573,     0,   556,   519,   539,   533,   550,   551,   534,   535,
-     536,   537,   545,   538,   548,   552,   541,   546,   542,   547,
-     540,   544,   543,   549,     0,   532,   512,   515,   526,   489,
-     516,   505,   510,   511,   508,   509,   506,   507,   501,   500,
-     525,   528,   518,   523,   504,     0,     0,     0,     0,     0,
-       0,     0,     0,   253,     0,     0,     0,   386,     0,     0,
-       0,   248,   244,   247,   229,   106,     0,     0,   118,     0,
-       0,   110,   111,   113,   112,    46,    47,     0,     0,     0,
-       0,     0,     0,     0,     0,   130,     0,     0,     0,   286,
-     622,   626,   624,   627,   623,   625,    83,    89,    81,    85,
-      84,    78,    77,    79,    67,     0,    68,     0,    82,    80,
-      88,    86,    87,     0,     0,     0,   303,     0,     0,   327,
-     301,    29,    30,    31,    32,    33,   225,   226,   218,   220,
-     222,   221,   219,   214,   227,   217,   215,   216,    34,    34,
-      34,    36,    35,   223,   224,   370,   372,   373,   383,   380,
-     378,   379,     0,   377,   367,   381,   382,   366,   371,   369,
-     384,   368,   407,   408,   428,   429,   421,     0,   420,   554,
-       0,   530,     0,   267,   268,   277,   274,   279,   276,   275,
-     281,   278,   280,   273,     0,   272,   266,   284,   283,   282,
-     265,   399,   391,     0,   390,   398,   235,   236,   234,     0,
-     233,   251,   250,     0,     0,     0,   114,     0,     0,     0,
-       0,   109,   147,   145,   187,   184,   183,   176,   178,   194,
-     188,   191,   186,   177,   192,   180,   189,   193,   181,   190,
-     185,   179,   182,     0,   175,   142,   144,   146,   158,   152,
-     169,   170,   153,   154,   155,   156,   164,   157,   167,   171,
-     160,   165,   161,   166,   159,   163,   162,   168,     0,   151,
-     143,   294,   295,   293,    69,    73,   310,   316,   322,   325,
-     318,   324,   319,   323,   321,   317,   320,     0,   315,   311,
-     333,   338,   344,   347,   340,   346,   341,   345,   343,   339,
-     342,     0,   337,    37,    38,    39,   375,     0,   418,     0,
-     555,   531,   270,     0,   388,     0,   231,     0,   249,   246,
-     245,     0,     0,     0,     0,   108,   173,     0,   149,     0,
-     313,     0,   335,     0,   376,   419,   271,   389,   232,   115,
-     124,   127,   126,   123,   128,   125,   122,     0,   121,   117,
-     116,   174,   150,   314,   336,   119,     0,   120
+       0,    34,     0,     0,   196,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   347,
+       0,     0,   399,   412,     0,     0,     0,   414,   493,   497,
+     511,   577,   525,   491,   519,   522,   492,   483,   482,   484,
+     485,   486,   500,   489,   490,   501,   488,   496,   495,   494,
+     520,   481,   518,   575,   576,   515,   512,   562,   555,   572,
+     573,   556,   557,   558,   559,   567,   560,   570,   574,   563,
+     568,   564,   569,   561,   566,   565,   571,     0,   554,   517,
+     537,   531,   548,   549,   532,   533,   534,   535,   543,   536,
+     546,   550,   539,   544,   540,   545,   538,   542,   541,   547,
+       0,   530,   510,   513,   524,   487,   514,   503,   508,   509,
+     506,   507,   504,   505,   499,   498,   523,   526,   516,   521,
+     502,     0,     0,     0,     0,     0,     0,     0,     0,   251,
+       0,     0,     0,   384,     0,     0,     0,   246,   242,   245,
+     227,   106,     0,     0,   118,     0,     0,   110,   111,   113,
+     112,    46,    47,     0,     0,     0,     0,     0,     0,     0,
+       0,   130,     0,     0,     0,   284,   620,   624,   622,   625,
+     621,   623,    83,    89,    81,    85,    84,    78,    77,    79,
+      67,     0,    68,     0,    82,    80,    88,    86,    87,     0,
+       0,     0,   301,     0,     0,   325,   299,    29,    30,    31,
+      32,    33,   223,   224,   216,   218,   220,   219,   217,   213,
+     225,   215,   214,    34,    34,    34,    36,    35,   221,   222,
+     368,   370,   371,   381,   378,   376,   377,     0,   375,   365,
+     379,   380,   364,   369,   367,   382,   366,   405,   406,   426,
+     427,   419,     0,   418,   552,     0,   528,     0,   265,   266,
+     275,   272,   277,   274,   273,   279,   276,   278,   271,     0,
+     270,   264,   282,   281,   280,   263,   397,   389,     0,   388,
+     396,   233,   234,   232,     0,   231,   249,   248,     0,     0,
+       0,   114,     0,     0,     0,     0,   109,   147,   145,   187,
+     184,   183,   176,   178,   194,   188,   191,   186,   177,   192,
+     180,   189,   193,   181,   190,   185,   179,   182,     0,   175,
+     142,   144,   146,   158,   152,   169,   170,   153,   154,   155,
+     156,   164,   157,   167,   171,   160,   165,   161,   166,   159,
+     163,   162,   168,     0,   151,   143,   292,   293,   291,    69,
+      73,   308,   314,   320,   323,   316,   322,   317,   321,   319,
+     315,   318,     0,   313,   309,   331,   336,   342,   345,   338,
+     344,   339,   343,   341,   337,   340,     0,   335,    37,    38,
+      39,   373,     0,   416,     0,   553,   529,   268,     0,   386,
+       0,   229,     0,   247,   244,   243,     0,     0,     0,     0,
+     108,   173,     0,   149,     0,   311,     0,   333,     0,   374,
+     417,   269,   387,   230,   115,   124,   127,   126,   123,   128,
+     125,   122,     0,   121,   117,   116,   174,   150,   312,   334,
+     119,     0,   120
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    24,   780,   781,  1021,  1022,    25,   230,   231,
-     232,   233,    26,   267,   268,   269,   270,   744,   745,   748,
-     749,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+      -1,     1,    24,   777,   778,  1016,  1017,    25,   230,   231,
+     232,   233,    26,   267,   268,   269,   270,   741,   742,   745,
+     746,   271,   272,   273,   274,   275,   276,   277,   278,   279,
      280,   281,   282,   283,    27,    71,    72,    73,    74,    75,
-      28,   222,   223,   224,   225,   226,   950,   951,   952,   953,
-     954,  1088,  1217,  1218,    29,    60,   501,   502,   503,   504,
-     505,   506,   507,   508,   509,   717,  1138,  1139,   510,   713,
-    1113,  1114,    30,    49,   328,   329,   330,   331,   332,   333,
-     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
-      31,    57,   476,   698,  1079,  1080,   477,   478,   479,  1085,
-     942,   943,   480,   481,    32,    55,   452,   453,   454,   455,
-     456,   457,   458,   684,  1064,  1065,   459,   460,   461,    33,
-      61,   515,   516,   517,   518,   519,    34,   288,   289,   290,
-      35,    64,   550,   551,   552,   553,   554,   758,  1157,  1158,
-      36,    65,   558,   559,   560,   561,   764,  1171,  1172,    37,
-      50,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   607,  1032,  1033,   368,   369,   370,   371,   372,    38,
-      56,   466,   693,  1073,  1074,   467,   468,   469,   470,    39,
-      51,   376,   377,   378,   379,    40,   112,   113,   114,    41,
-      53,   387,   626,  1047,  1048,   388,   389,   390,   391,    42,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   423,   904,   905,
-     213,   421,   881,   882,   214,   215,   216,    43,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,    44,   243,   244,   245,   246,   247,
-     248,   249,   250
+      28,   222,   223,   224,   225,   226,   946,   947,   948,   949,
+     950,  1083,  1212,  1213,    29,    60,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   714,  1133,  1134,   508,   710,
+    1108,  1109,    30,    49,   327,   328,   329,   330,   331,   332,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,    31,
+      57,   474,   695,  1074,  1075,   475,   476,   477,  1080,   938,
+     939,   478,   479,    32,    55,   450,   451,   452,   453,   454,
+     455,   456,   681,  1059,  1060,   457,   458,   459,    33,    61,
+     513,   514,   515,   516,   517,    34,   288,   289,   290,    35,
+      64,   548,   549,   550,   551,   552,   755,  1152,  1153,    36,
+      65,   556,   557,   558,   559,   761,  1166,  1167,    37,    50,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     604,  1027,  1028,   366,   367,   368,   369,   370,    38,    56,
+     464,   690,  1068,  1069,   465,   466,   467,   468,    39,    51,
+     374,   375,   376,   377,    40,   112,   113,   114,    41,    53,
+     385,   623,  1042,  1043,   386,   387,   388,   389,    42,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   421,   900,   901,   213,
+     419,   877,   878,   214,   215,   216,    43,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,    44,   243,   244,   245,   246,   247,   248,
+     249,   250
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -744
+#define YYPACT_NINF -745
 static const yytype_int16 yypact[] =
 {
-    -744,   610,  -744,  -209,  -187,  -179,  -744,  -744,  -744,  -176,
-    -744,  -171,  -744,  -744,  -744,  -166,  -164,  -744,  -744,  -139,
-    -136,  -744,  -744,  -131,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,    61,   807,  -126,
-    -104,   -84,    16,   -79,   382,   -77,   -63,   -60,     7,    21,
-     -49,   -40,   638,   381,   -26,    52,    25,  -152,    62,    85,
-      86,    18,  -744,  -744,  -744,  -744,  -744,    88,    89,    93,
-      94,    96,   101,   108,   112,   118,   119,   125,   127,   132,
-     133,   162,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,   531,   499,   266,
-    -744,   135,    28,  -744,  -744,    11,  -744,   142,   143,   145,
-     147,   148,   150,   153,   163,   166,   167,   169,   173,   174,
-     175,   177,   178,   180,   182,   183,   185,   191,   197,   200,
-     201,   202,   204,   211,   212,   215,  -744,   216,  -744,   217,
-     218,   221,   222,   225,   226,   229,   234,   235,   237,   238,
-     239,   242,   253,   256,   257,   262,    38,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,   337,    24,   259,
-      73,   263,     4,  -744,  -744,  -744,   126,   131,   264,   270,
-      59,  -744,  -744,  -744,   389,   209,  -744,   276,   279,   280,
-     281,   285,   287,     3,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,   149,   288,   289,   290,   292,   299,   301,   302,   303,
-     304,   305,   307,   308,   315,   324,   330,    75,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,   208,    30,  -744,   331,    15,  -744,
-    -744,  -744,   107,   254,   359,   165,  -744,   385,   396,   367,
-     454,   454,   455,   457,   461,   399,   401,   464,   454,   404,
-     405,   351,  -744,   358,   356,   360,   361,   362,   364,   365,
-     369,   374,   375,   379,   383,   386,   388,   395,   232,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,   384,   397,   400,   403,   408,  -744,
-     411,   412,   420,   423,   424,   427,   433,   434,   260,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,   435,   437,     8,  -744,  -744,  -744,
-     458,   407,  -744,  -744,   441,   442,  -744,  -744,    36,  -744,
-    -744,  -744,   417,   454,   454,   501,   443,   459,   524,   543,
-     502,   454,   503,   454,   565,   567,   568,   508,   509,   513,
-     454,   577,   578,   454,   580,   583,   566,   584,   587,   527,
-     528,   475,   535,   478,   454,   454,   537,   540,   541,   542,
-    -146,  -133,   544,   546,   454,   454,   585,   454,   550,   553,
-     554,   510,  -744,   515,   514,   517,  -744,   519,   521,   525,
-     529,   530,    58,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,   533,  -744,   534,  -744,    10,  -744,  -744,
-    -744,   538,  -744,   536,   539,   545,  -744,   115,  -744,  -744,
-    -744,  -744,  -744,   582,   547,  -744,   532,  -744,   640,   643,
-     549,  -744,   555,   559,   560,  -744,   562,   569,   572,  -744,
-     573,    70,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,   558,   588,   595,   597,   146,  -744,  -744,  -744,  -744,
-     623,   625,   687,   658,   659,   454,   606,  -744,  -744,   704,
-     663,   706,   707,   709,   713,   714,   715,    79,   159,   717,
-     718,   646,   719,   720,   626,  -744,   628,   622,  -744,   624,
-     128,  -744,  -744,  -744,  -744,   629,   630,  -744,    22,  -744,
-    -744,  -744,   728,   632,  -744,   634,   635,   636,  -744,   637,
-     639,   641,   430,   642,   645,   648,   649,   650,   651,   652,
-     653,   654,   656,   657,  -744,  -744,   754,   756,   454,   759,
-     776,   778,   779,   761,   784,   785,   454,   454,   786,   786,
-     671,  -744,  -744,   769,   122,   770,   729,   672,   773,   774,
-     775,   777,   795,   780,   781,   782,   681,  -744,   783,   787,
-     682,  -744,   689,  -744,   788,   789,   690,   694,  -744,   695,
-     696,   697,   698,   699,   702,   703,   705,   708,   710,   712,
-     716,   721,   722,   723,   724,   725,   726,   727,   730,   731,
-     732,   733,   734,   735,   736,   737,   738,   739,   551,   740,
-     599,   741,   742,   743,   744,   745,   746,   747,   748,   749,
-     750,   751,   752,   753,   755,   757,   758,   760,   762,   763,
-    -744,  -744,   801,   764,   711,   803,   823,   810,   812,   814,
-     765,  -744,   815,   766,   817,   767,  -744,  -744,   768,   825,
-     826,   870,   772,  -744,   790,  -744,   184,   791,   792,  -744,
-    -744,   853,   816,   771,   856,   861,   863,   793,   865,   794,
-    -744,  -744,   867,   872,   873,   797,  -744,   798,   799,   800,
-     802,   804,   805,  -744,   806,   808,   809,   811,   813,   818,
-     819,   820,  -744,  -744,  -195,  -744,  -744,  -744,  -172,  -744,
-     821,   822,   824,   827,   828,  -744,  -744,   874,   829,   875,
-     830,  -744,  -744,   876,   831,   833,  -744,   835,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,   454,   454,   454,   454,   454,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,   836,   837,   838,   839,   840,   841,   842,
-     843,   844,   845,   846,   847,   314,   848,   849,  -744,   850,
-     851,   852,   854,   855,    13,   857,   858,   859,   860,   862,
-     864,   866,   868,  -744,   869,   871,  -744,  -744,   877,   878,
-     879,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -167,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -154,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,   880,   881,   309,   882,   883,
-     884,   885,   886,  -744,   887,   893,   888,  -744,   -33,   889,
-     890,   832,   891,  -744,  -744,  -744,   892,   894,  -744,   895,
-     154,  -744,  -744,  -744,  -744,  -744,  -744,   896,   899,   511,
-     900,   901,   902,   627,   903,  -744,   904,   905,   906,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,    79,  -744,   159,  -744,  -744,
-    -744,  -744,  -744,   907,   460,   908,  -744,   909,   665,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,   786,   786,
-     786,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -145,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,   -50,  -744,  -744,
-     551,  -744,   599,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,   -41,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,   -27,  -744,  -744,  -744,  -744,  -744,   -17,
-    -744,  -744,  -744,   898,   870,   910,  -744,   911,   912,   -86,
-     913,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,    34,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,    40,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,    53,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,    63,  -744,  -744,  -744,  -744,  -744,    13,  -744,   879,
-    -744,  -744,  -744,   309,  -744,   893,  -744,   -33,  -744,  -744,
-    -744,   914,   277,   916,   917,  -744,  -744,   511,  -744,   627,
-    -744,   460,  -744,   665,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,    68,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,   277,  -744
+    -745,   615,  -745,  -209,  -208,  -192,  -745,  -745,  -745,  -190,
+    -745,  -183,  -745,  -745,  -745,  -169,  -167,  -745,  -745,  -144,
+    -137,  -745,  -745,  -132,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,   292,   784,  -111,
+    -102,   -93,    22,   -90,   389,   -80,   -74,   -72,    50,    15,
+     -65,   -60,   299,   388,   -54,   -34,    18,  -176,   -58,   -32,
+     -22,     3,  -745,  -745,  -745,  -745,  -745,   -15,    -9,    26,
+      38,    67,    69,    75,    80,    82,    88,    90,    93,   100,
+     107,   195,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,   569,   505,    13,
+    -745,   115,    12,  -745,  -745,   258,  -745,   117,   122,   129,
+     131,   140,   141,   144,   145,   146,   154,   155,   156,   159,
+     161,   165,   166,   168,   170,   174,   175,   176,   177,   180,
+     190,   194,   197,   199,   203,   204,  -745,   205,  -745,   206,
+     209,   211,   212,   215,   219,   221,   224,   225,   229,   230,
+     233,   234,   236,   237,   239,   240,    36,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,   343,    60,   284,
+    -157,   241,    43,  -745,  -745,  -745,    66,   113,   242,   245,
+      99,  -745,  -745,  -745,   348,    62,  -745,   249,   253,   264,
+     266,   267,   271,    16,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,   268,   273,   274,   280,   281,   285,   287,   290,   294,
+     295,   296,   297,   306,   307,   308,   309,    74,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,   220,   277,  -745,   310,    20,  -745,
+    -745,  -745,   252,   370,   384,   302,  -745,   410,   430,   371,
+     432,   432,   433,   434,   436,   379,   390,   453,   432,   395,
+     396,   342,  -745,   345,   349,   350,   352,   354,   355,   357,
+     360,   361,   362,   363,   365,   366,   369,   152,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,   346,   372,   381,   385,   386,  -745,   392,   393,
+     397,   400,   401,   405,   407,   408,   270,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,   409,   413,    51,  -745,  -745,  -745,   445,   351,
+    -745,  -745,   414,   417,  -745,  -745,     8,  -745,  -745,  -745,
+     428,   432,   432,   502,   446,   447,   508,   495,   454,   432,
+     461,   432,   528,   536,   537,   480,   485,   493,   432,   556,
+     557,   432,   562,   563,   548,   567,   568,   512,   513,   456,
+     519,   459,   432,   432,   521,   522,   523,   524,    14,    54,
+     530,   532,   432,   432,   570,   432,   533,   535,   538,   474,
+    -745,   481,   479,   483,  -745,   484,   488,   492,   498,   501,
+     128,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,   503,  -745,   506,  -745,    19,  -745,  -745,  -745,   514,
+    -745,   515,   518,   520,  -745,   116,  -745,  -745,  -745,  -745,
+    -745,   539,   516,  -745,   496,  -745,   602,   612,   526,  -745,
+     527,   531,   534,  -745,   540,   544,   545,  -745,   553,   183,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,   541,
+     560,   561,   573,    11,  -745,  -745,  -745,  -745,   572,   575,
+     621,   584,   585,   432,   542,  -745,  -745,   629,   586,   630,
+     632,   636,   637,   663,   670,   112,   196,   684,   691,   674,
+     696,   701,   605,  -745,   619,   617,  -745,   622,    59,  -745,
+    -745,  -745,  -745,   627,   626,  -745,   110,  -745,  -745,  -745,
+     719,   633,  -745,   635,   638,   639,  -745,   641,   642,   646,
+     265,   647,   648,   649,   650,   651,   652,   653,   654,   655,
+     657,   658,  -745,  -745,   771,   774,   432,   775,   776,   777,
+     778,   761,   782,   783,   432,   785,   785,   669,  -745,  -745,
+     768,   164,   769,   728,   671,   772,   773,   779,   780,   792,
+     781,   786,   787,   680,  -745,   788,   789,   681,  -745,   685,
+    -745,   790,   791,   683,   687,  -745,   695,   697,   698,   699,
+     700,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   720,   721,
+     722,   723,   724,   725,   726,   600,   727,   628,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,   744,   745,   746,   747,  -745,  -745,   798,
+     803,   748,   816,   843,   846,   847,   849,   753,  -745,   851,
+     752,   853,   757,  -745,  -745,   755,   856,   857,   876,   762,
+    -745,   763,  -745,   187,   764,   765,  -745,  -745,   863,   822,
+     766,   865,   867,   868,   770,   869,   793,  -745,  -745,   871,
+     872,   873,   794,  -745,   795,   796,   797,   799,   800,   801,
+    -745,   802,   804,   805,   806,   807,   808,   809,   810,  -745,
+    -745,  -196,  -745,  -745,  -745,  -179,  -745,   811,   812,   813,
+     814,   815,  -745,  -745,   874,   817,   875,   818,  -745,  -745,
+     877,   819,   821,  -745,   823,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,   432,   432,   432,   432,   432,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+     824,   825,   826,   827,   828,   829,   830,   831,   832,   833,
+     834,    79,   835,   836,  -745,   837,   838,   839,   840,   841,
+      -1,   842,   844,   845,   848,   850,   852,   854,   855,  -745,
+     858,   859,  -745,  -745,   860,   861,   878,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -178,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -173,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,   862,   864,   693,   866,   870,   879,   880,   881,  -745,
+     882,   883,   884,  -745,   -36,   885,   886,   894,   887,  -745,
+    -745,  -745,   888,   889,  -745,   890,    86,  -745,  -745,  -745,
+    -745,  -745,  -745,   895,   896,   517,   897,   898,   899,   656,
+     900,  -745,   901,   902,   903,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,   112,  -745,   196,  -745,  -745,  -745,  -745,  -745,   904,
+     464,   905,  -745,   906,   529,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,   785,   785,   785,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -168,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -160,  -745,  -745,   600,  -745,   628,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -159,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,   -57,  -745,
+    -745,  -745,  -745,  -745,   -38,  -745,  -745,  -745,   907,   876,
+     908,  -745,   913,   891,   -88,   909,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,    -7,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,    63,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,    94,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,   101,  -745,  -745,  -745,
+    -745,  -745,    -1,  -745,   878,  -745,  -745,  -745,   693,  -745,
+     883,  -745,   -36,  -745,  -745,  -745,   910,   403,   911,   912,
+    -745,  -745,   517,  -745,   656,  -745,   464,  -745,   529,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,   104,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,   403,  -745
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -744,  -744,  -744,  -743,  -298,  -663,  -598,  -744,  -744,   897,
-    -744,  -744,  -744,  -744,   915,  -744,  -744,  -744,    14,  -744,
-       1,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,   924,  -744,  -744,  -744,
-    -744,  -744,   796,  -744,  -744,  -744,  -744,    48,  -744,  -744,
-    -744,  -744,  -744,  -226,  -744,  -744,  -744,   500,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -196,  -744,  -744,
-    -744,  -193,  -744,  -744,  -744,   680,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -177,  -744,   548,  -744,  -744,
-    -744,   -62,  -744,  -744,  -744,  -744,  -744,   575,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -153,  -744,  -744,  -744,  -744,
-    -744,  -744,   516,  -744,  -744,  -744,  -744,  -744,   918,  -744,
-    -744,  -744,  -744,   482,  -744,  -744,  -744,  -744,  -744,  -163,
-    -744,  -744,  -744,   483,  -744,  -744,  -744,  -744,  -159,  -744,
-    -744,  -744,   688,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -137,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -117,  -744,   604,  -744,  -744,  -744,
-    -744,  -744,   700,  -744,  -744,  -744,  -744,   966,  -744,  -744,
-    -744,  -744,  -744,  -744,   -99,  -744,   701,  -744,  -744,  -744,
-    -744,   919,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,    35,
-    -744,  -744,  -744,    32,  -744,  -744,  -744,  -744,  -744,   997,
-    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
-    -744,  -744,  -744,  -744,  -744,  -744,   920,  -744,  -744,  -744,
-    -744,  -744,  -744
+    -745,  -745,  -745,  -744,  -298,  -659,  -595,  -745,  -745,   767,
+    -745,  -745,  -745,  -745,   750,  -745,  -745,  -745,    17,  -745,
+      10,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,   924,  -745,  -745,  -745,
+    -745,  -745,   914,  -745,  -745,  -745,  -745,    53,  -745,  -745,
+    -745,  -745,  -745,  -225,  -745,  -745,  -745,   504,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -193,  -745,  -745,
+    -745,  -188,  -745,  -745,  -745,   675,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -170,  -745,   558,  -745,  -745,  -745,
+     -48,  -745,  -745,  -745,  -745,  -745,   610,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -117,  -745,  -745,  -745,  -745,  -745,
+    -745,   550,  -745,  -745,  -745,  -745,  -745,   892,  -745,  -745,
+    -745,  -745,   543,  -745,  -745,  -745,  -745,  -745,  -131,  -745,
+    -745,  -745,   511,  -745,  -745,  -745,  -745,  -128,  -745,  -745,
+    -745,   820,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -101,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -103,  -745,   614,  -745,  -745,  -745,  -745,
+    -745,   754,  -745,  -745,  -745,  -745,   969,  -745,  -745,  -745,
+    -745,  -745,  -745,   -92,  -745,   749,  -745,  -745,  -745,  -745,
+     917,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,    39,  -745,
+    -745,  -745,    40,  -745,  -745,  -745,  -745,  -745,   996,  -745,
+    -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,  -745,
+    -745,  -745,  -745,  -745,  -745,   915,  -745,  -745,  -745,  -745,
+    -745,  -745
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1921,387 +1919,383 @@ static const yytype_int16 yypgoto[] =
 #define YYTABLE_NINF -108
 static const yytype_int16 yytable[] =
 {
-     806,   807,   573,   574,   236,   220,    45,    46,   220,   373,
-     581,   462,   383,   805,   667,   668,   286,   110,  1076,    67,
-     984,  1030,   227,   555,   985,   462,   286,   669,   670,   110,
-      47,   555,  1001,  1002,  1003,  1004,  1005,   383,    48,   116,
-     237,    52,    68,   986,   117,   118,    54,   987,  1049,    69,
-     119,    58,  1050,    59,   238,   239,   240,   241,   120,   443,
-     227,  1051,    67,   291,   121,  1052,   122,   123,   124,   374,
-    1176,   492,   242,   125,  1177,   444,   251,   111,    62,   126,
-     127,    63,   128,   129,   130,    68,    66,   493,   131,   111,
-     445,   107,    69,   132,   446,   630,   631,   133,   134,   252,
-     384,   135,   494,   638,   287,   640,   495,    70,   228,  1193,
-     136,   556,   647,   108,   287,   650,   471,   137,   138,   556,
-     139,   140,   141,   142,   143,   384,   661,   662,   375,   546,
-     463,   385,   253,   109,   229,   144,   673,   674,   115,   676,
-     217,   145,   146,   147,   463,   148,   228,   511,   149,   150,
-      70,   472,   151,  1077,   218,   946,   385,   219,  1078,   496,
-     512,   464,   386,    76,   254,  1178,   255,   256,   234,  1179,
-     447,   473,   229,   557,  1182,   464,   474,   235,  1183,   448,
-     449,   557,   497,    77,    78,   946,   152,   386,  1184,    79,
-     153,   284,  1185,   154,   155,   156,   157,   158,  1186,   498,
-     159,   160,  1187,   257,  1031,   258,   259,   260,   261,   546,
-     511,   450,   221,   742,   743,   221,   465,   547,  -107,   526,
-     484,  -107,   262,   512,   620,   565,   695,   732,    80,    81,
-     465,   563,   475,   313,   295,    82,    83,    84,   765,   513,
-     161,   162,   163,   947,   381,   164,   263,   314,   315,  1196,
-     165,   316,   627,  1197,   441,  1198,   264,    85,    86,  1199,
-     471,   344,   499,   345,   451,   346,   514,   373,  1200,   285,
-      87,    88,  1201,   947,   690,   490,   500,   347,  1202,   548,
-     292,    89,  1203,  1225,   265,   266,   719,  1226,   482,    90,
-     795,   544,   348,   746,   747,   472,   349,   547,   803,   804,
-     810,   811,   513,   293,   294,   948,   297,   298,   317,   318,
-     319,   299,   300,   320,   301,   473,   350,  1210,   351,   302,
-     474,   321,  1055,  1018,  1019,  1020,   303,   374,   352,   514,
-     304,   702,   322,   323,   549,   948,   305,   306,   443,  1211,
-     486,  1212,  1056,   307,   760,   308,   487,   324,   325,   353,
-     309,   310,  1057,   380,   444,  1173,  1174,  1175,  1058,   548,
-     392,   393,   725,   394,   528,   395,   396,   949,   397,   445,
-    1090,   398,   566,   446,  1059,   326,   475,   354,   311,  1213,
-     568,   399,   251,   116,   400,   401,   375,   402,   117,   118,
-     492,   403,   404,   405,   119,   406,   407,   949,   408,  1060,
-     409,   410,   120,   411,   355,   252,   493,  1061,   121,   412,
-     122,   123,   124,   805,   549,   413,   327,   125,   414,   415,
-     416,   494,   417,   126,   127,   495,   128,   129,   130,   418,
-     419,   356,   131,   420,   422,   424,   425,   132,   253,   426,
-     427,   133,   134,   428,   429,   135,  1062,   430,   600,   447,
-    1214,  1215,   431,   432,   136,   433,   434,   435,   448,   449,
-     436,   137,   138,  1063,   139,   140,   141,   142,   143,   357,
-     254,   437,   255,   256,   438,   439,   616,   567,   496,   144,
-     440,   483,   488,  1216,   569,   145,   146,   147,   489,   148,
-     450,  1194,   149,   150,   520,   570,   151,   521,   522,   523,
-     344,   497,   345,   524,   346,   525,   529,   530,   531,   257,
-     532,   258,   259,   260,   261,  1094,   347,   533,   498,   534,
-     535,   536,   537,   538,  1147,   539,   540,   571,   262,   572,
-     152,   348,   313,   541,   153,   349,  1095,   154,   155,   156,
-     157,   158,   542,   451,   159,   160,   314,   315,   543,   562,
-     316,  1096,   263,   572,   575,   350,   576,   351,  1097,   578,
-     577,   579,   264,   580,   582,   583,   584,   352,   775,   776,
-     777,   778,   779,   585,   586,  1098,   622,   629,   587,   588,
-     589,   499,   590,   591,   161,   162,   163,   592,   353,   164,
-     265,   266,   593,   594,   165,   500,  1148,   595,  1099,   602,
-     632,   596,   861,   633,   597,  1100,   598,   317,   318,   319,
-       2,     3,   320,   599,     4,   603,   354,  1101,   604,   634,
-     321,   605,   623,   635,     5,  1149,   606,     6,     7,   608,
-     609,   322,   323,     8,  1150,  1102,  1103,  1104,   610,   236,
-    1151,   611,   612,   355,     9,   613,   324,   325,    10,    11,
-     884,   614,   615,   618,  1152,   619,  1153,  1154,    12,   624,
-     625,   636,   637,   639,   641,  1155,   642,   643,   644,   645,
-     356,  1156,    13,   646,   326,   237,   648,   649,  1118,   651,
-      14,    15,   652,   654,   653,  1105,   655,   656,   657,   238,
-     239,   240,   241,   658,  1106,   659,   660,   663,    16,  1107,
-     664,   665,   666,   675,   671,  1108,   672,   242,   357,  1109,
-     677,  1110,    17,   678,   679,   327,  1111,   862,   863,   864,
-     865,   866,  1112,   867,   868,   680,   869,   870,   871,  1161,
-     681,   872,   682,   873,   874,   683,   875,   685,   876,   686,
-     877,   878,   704,   687,   879,   752,    18,   688,   689,   706,
-     880,   692,   694,   697,   699,    19,    20,   700,   707,    21,
-      22,   708,   705,   701,   709,   885,   886,   887,   888,   889,
-     710,   890,   891,   721,   892,   893,   894,   711,   712,   895,
-     714,   896,   897,   727,   898,   728,   899,   715,   900,   901,
-     716,   718,   902,  1119,  1120,  1121,  1122,  1123,   903,  1124,
-    1125,  1162,  1126,  1127,  1128,   729,   722,  1129,    76,  1130,
-    1131,    23,  1132,   723,  1133,   724,  1134,  1135,   730,   731,
-    1136,   733,   734,   735,   736,   737,  1137,   738,    77,    78,
-    1163,   739,   740,   741,    79,   750,   751,   753,   754,  1164,
-     757,   755,   759,   756,   762,  1165,   767,   768,   763,   769,
-     770,   771,   772,   793,   773,   794,   774,   782,   796,  1166,
-     783,  1167,  1168,   784,   785,   786,   787,   788,   789,   790,
-    1169,   791,   792,    80,    81,   797,  1170,   798,   799,   800,
-      82,    83,    84,   801,   802,   805,   808,   809,   812,   813,
-     814,   815,   816,   817,   819,   818,   823,   826,   820,   821,
-     822,   824,    85,    86,   827,   825,   828,   829,   830,   831,
-     832,   833,   834,   835,   836,    87,    88,   837,   838,   925,
-     839,   928,   929,   840,   926,   841,    89,   842,   930,   927,
-     931,   843,   932,   934,    90,   936,   844,   845,   846,   847,
-     848,   849,   850,   939,   940,   851,   852,   853,   854,   855,
-     856,   857,   858,   859,   860,   883,   906,   907,   908,   909,
-     910,   911,   912,   913,   914,   915,   916,   917,   918,   941,
-     919,   957,   920,   921,   960,   922,   958,   923,   924,   961,
-     933,   962,   937,   964,   935,   966,   938,   944,  1145,   959,
-     967,   968,   993,   995,   997,   296,  1083,  1188,  1091,  1144,
-    1227,   720,  1046,  1222,  1221,   945,   955,   956,   601,   965,
-    1208,   963,   969,   970,   971,   972,  1072,   973,   485,   974,
-     975,   976,  1189,   977,   978,   703,   979,   691,   980,  1191,
-    1206,   726,   761,   981,   982,   983,   988,   989,  1223,   990,
-    1204,   766,   991,   992,  1224,   996,   617,   994,   999,   998,
-    1000,  1006,  1007,  1008,  1009,  1010,  1011,  1012,  1013,  1014,
-    1015,  1016,  1017,  1023,  1024,  1025,  1026,  1027,  1207,  1028,
-    1029,   696,  1034,  1035,  1036,  1037,   621,  1038,   382,  1039,
-    1205,  1040,  1180,  1041,  1042,   442,  1043,  1181,   312,   628,
-       0,     0,  1044,  1045,     0,  1053,  1054,  1066,  1067,  1068,
-    1069,  1070,  1071,  1075,  1081,  1082,     0,  1086,     0,     0,
-    1084,  1092,  1087,  1089,  1093,  1115,  1116,  1117,  1140,  1141,
-    1142,  1143,  1146,  1159,  1160,  1190,     0,   491,  1195,  1209,
-    1192,  1219,  1220,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     802,   803,   571,   572,    67,    45,    46,  1025,    47,   381,
+     579,   801,   509,   110,   371,  1071,   227,   236,   980,   286,
+     460,   286,   981,   110,    48,   510,    52,    68,   997,   998,
+     999,  1000,  1001,    54,    69,   982,  1044,   116,   291,   983,
+    1045,  1046,   117,   118,   220,  1047,  1171,    58,   119,    59,
+    1172,   220,   371,   237,  1173,  1177,   120,   480,  1174,  1178,
+     544,   460,   121,   509,   122,   123,   124,   238,   239,   240,
+     241,   125,    62,   111,   372,   251,   510,   126,   127,    63,
+     128,   129,   130,   111,    66,   242,   131,   942,  1013,  1014,
+    1015,   132,    70,   627,   628,   133,   134,   382,   252,   135,
+     227,   635,   228,   637,   511,   107,  1188,   287,   136,   287,
+     644,   553,   372,   647,   108,   137,   138,   469,   139,   140,
+     141,   142,   143,   109,   658,   659,   115,   383,   229,   441,
+     512,   253,   373,   144,   670,   671,   217,   673,   461,   145,
+     146,   147,   218,   148,   219,   442,   149,   150,   545,  1072,
+     151,   234,   470,   313,  1073,   511,   235,  1179,   384,   292,
+     443,  1180,   284,   254,   444,   255,   256,   314,   315,   462,
+     373,   316,   471,   664,   665,   943,  1181,   472,   801,   461,
+    1182,   512,   285,   152,   490,   293,   228,   153,   942,  1026,
+     154,   155,   156,   157,   158,   294,    76,   159,   160,   554,
+     491,   257,   297,   258,   259,   260,   261,  1191,   298,   546,
+     462,  1192,   229,   666,   667,   492,    77,    78,   295,   493,
+     262,   544,    79,   624,   463,   729,   722,   379,   317,   318,
+     319,   524,   473,   320,   692,   561,   944,   161,   162,   163,
+     445,   321,   164,   299,   263,   739,   740,   165,   446,   447,
+     221,   439,   322,   323,   264,   300,  -107,   221,   482,   381,
+     555,    80,    81,  -107,   547,   463,   617,   324,    82,    83,
+      84,   342,   494,   343,   757,   344,   943,  1193,   553,   484,
+     448,  1194,   265,   266,   301,   469,   302,   345,   792,   542,
+      85,    86,   303,    67,   325,   495,   800,   304,   945,   305,
+     236,  1085,   346,    87,    88,   306,   347,   307,  1195,   545,
+     308,   496,  1196,    89,   488,  1197,    68,   309,  1220,  1198,
+     470,    90,  1221,    69,   310,   762,   348,   485,   349,   743,
+     744,   699,   378,   449,   390,   326,   237,   944,   350,   391,
+     471,   806,   807,   687,   441,   472,   392,   382,   393,   490,
+     238,   239,   240,   241,  1168,  1169,  1170,   394,   395,   351,
+     442,   396,   397,   398,   570,   491,   554,   597,   242,   563,
+     546,   399,   400,   401,   497,   443,   402,   383,   403,   444,
+     492,    70,   404,   405,   493,   406,   352,   407,   498,   251,
+     116,   408,   409,   410,   411,   117,   118,   412,   716,   945,
+     473,   119,   772,   773,   774,   775,   776,   413,   384,   120,
+     311,   414,   252,   353,   415,   121,   416,   122,   123,   124,
+     417,   418,   420,   422,   125,   547,   423,   555,   424,   425,
+     126,   127,   426,   128,   129,   130,   427,   494,   428,   131,
+     354,   429,   430,  1205,   132,   253,   431,   432,   133,   134,
+     433,   434,   135,   435,   436,   445,   437,   438,   481,   486,
+     495,   136,   487,   446,   447,  1206,   518,  1207,   137,   138,
+     519,   139,   140,   141,   142,   143,   496,   254,   355,   255,
+     256,   520,   526,   521,   522,   613,   144,   564,   523,  1189,
+     527,   528,   145,   146,   147,   448,   148,   529,   530,   149,
+     150,   565,   531,   151,   532,  1208,   342,   533,   343,   567,
+     344,   534,   535,   536,   537,   257,   566,   258,   259,   260,
+     261,  1089,   345,   538,   539,   540,   541,   560,  1142,   568,
+     569,   570,   573,   574,   262,   575,   152,   346,   576,   497,
+     153,   347,  1090,   154,   155,   156,   157,   158,   449,   577,
+     159,   160,   578,   498,   580,   581,   582,  1091,   263,   583,
+     599,   348,   619,   349,  1092,   620,   584,   585,   264,   586,
+     313,   587,   588,   350,   589,  1209,  1210,   590,   591,   592,
+     593,  1093,   594,   595,   314,   315,   596,   626,   316,   600,
+     161,   162,   163,  1156,   351,   164,   265,   266,   601,  1143,
+     165,   629,   602,   603,  1094,   630,   631,   632,  1211,   605,
+     606,  1095,   633,   634,   607,     2,     3,   608,   609,     4,
+     636,   352,   610,  1096,   611,   612,   615,   638,  1144,     5,
+     616,   621,     6,     7,   622,   639,   640,  1145,     8,   641,
+    1097,  1098,  1099,  1146,   642,   317,   318,   319,   353,     9,
+     320,   857,   643,    10,    11,   645,   646,  1147,   321,  1148,
+    1149,   648,   649,    12,  1157,   650,   651,   652,  1150,   322,
+     323,   653,   654,   655,  1151,   354,   657,    13,   656,   880,
+     660,   661,   662,   663,   324,    14,    15,   672,   677,   668,
+    1100,   669,   674,  1158,   675,   678,   679,   676,   701,  1101,
+     680,   682,  1159,    16,  1102,   683,  1050,  1113,  1160,   684,
+    1103,   325,   703,   355,  1104,   685,  1105,    17,   686,   704,
+     689,  1106,  1161,   691,  1162,  1163,  1051,  1107,   694,   705,
+     702,   724,   696,  1164,   725,   697,  1052,   698,   726,  1165,
+     706,   707,  1053,   727,   728,   732,   731,   733,   708,   734,
+      18,   709,   326,   735,   736,   718,   730,   711,  1054,    19,
+      20,   712,   713,    21,    22,   858,   859,   860,   861,   862,
+     715,   863,   864,   749,   865,   866,   867,   719,   720,   868,
+     737,   869,   870,  1055,   871,    76,   872,   738,   873,   874,
+     721,  1056,   875,   881,   882,   883,   884,   885,   876,   886,
+     887,   747,   888,   889,   890,    77,    78,   891,   748,   892,
+     893,    79,   894,   750,   895,    23,   896,   897,   751,   752,
+     898,  1114,  1115,  1116,  1117,  1118,   899,  1119,  1120,  1057,
+    1121,  1122,  1123,   753,   754,  1124,   764,  1125,  1126,   756,
+    1127,   759,  1128,   760,  1129,  1130,  1058,   765,  1131,   766,
+      80,    81,   767,   768,  1132,   769,   770,    82,    83,    84,
+     771,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     790,   788,   789,   791,   793,   794,   795,   796,   797,    85,
+      86,   798,   799,   804,   801,   805,   808,   809,   810,   811,
+     812,   815,    87,    88,   819,   822,   813,   814,   816,   823,
+     826,   827,    89,   817,   818,   820,   821,   824,   825,   828,
+      90,   829,   830,   831,   832,   921,   833,   834,   835,   836,
+     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
+     847,   848,   849,   924,   850,   851,   852,   853,   854,   855,
+     856,   879,   925,   902,   903,   904,   905,   906,   907,   908,
+     909,   910,   911,   912,   913,   914,   915,   916,   917,   918,
+     919,   920,   922,   926,   927,   923,   928,   929,   930,   931,
+     932,   933,   934,   935,   936,   937,   940,   941,   951,   952,
+     953,   954,   956,   955,   957,   958,   960,   959,   962,   963,
+     964,   989,   991,  1140,   993,   296,  1222,   489,  1139,  1086,
+    1041,  1217,   598,   717,  1216,  1067,  1183,   961,   965,   966,
+     967,   968,  1203,   969,   970,   971,   972,   543,   973,   974,
+     975,   976,   977,   978,   979,   984,   985,   986,   987,   988,
+    1186,  1184,   992,   700,   990,   995,   994,   996,  1002,  1003,
+    1004,  1005,  1006,  1007,  1008,  1009,  1010,  1011,  1012,  1018,
+    1019,  1020,  1021,  1022,  1023,  1024,  1029,  1078,  1030,  1031,
+     688,  1201,  1032,   723,  1033,  1218,  1034,   763,  1035,  1036,
+    1219,  1199,  1037,  1038,  1039,  1040,  1048,  1202,  1049,   693,
+    1061,   380,  1200,   440,  1062,  1175,  1176,   312,     0,     0,
+       0,   758,     0,  1063,  1064,  1065,  1066,     0,  1070,  1076,
+    1077,     0,  1081,     0,     0,  1079,  1082,  1084,  1187,  1087,
+    1088,  1110,  1111,  1112,  1135,  1136,  1137,  1138,  1141,  1154,
+    1155,     0,  1185,  1190,  1204,  1214,  1215,     0,   618,     0,
+       0,     0,     0,     0,     0,   625,   483,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   527,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   525,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   545,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   564
+       0,     0,     0,     0,     0,     0,   614,     0,     0,     0,
+     562
 };
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-744)))
+  (!!((Yystate) == (-745)))
 
 #define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
 static const yytype_int16 yycheck[] =
 {
-     598,   599,   300,   301,     1,     1,   215,   216,     1,     1,
-     308,     1,     1,    99,   160,   161,     1,     1,    51,     1,
-     215,     8,     1,     1,   219,     1,     1,   160,   161,     1,
-     217,     1,   775,   776,   777,   778,   779,     1,   217,     1,
-      37,   217,    24,   215,     6,     7,   217,   219,   215,    31,
-      12,   217,   219,   217,    51,    52,    53,    54,    20,     1,
-       1,   215,     1,   215,    26,   219,    28,    29,    30,    61,
-     215,     1,    69,    35,   219,    17,     1,    61,   217,    41,
-      42,   217,    44,    45,    46,    24,   217,    17,    50,    61,
-      32,   217,    31,    55,    36,   393,   394,    59,    60,    24,
-      89,    63,    32,   401,    89,   403,    36,    89,    87,   195,
-      72,    89,   410,   217,    89,   413,     1,    79,    80,    89,
-      82,    83,    84,    85,    86,    89,   424,   425,   120,     1,
-     120,   120,    57,   217,   113,    97,   434,   435,   217,   437,
-     217,   103,   104,   105,   120,   107,    87,     1,   110,   111,
-      89,    36,   114,   186,   217,     1,   120,   217,   191,    89,
-      14,   151,   151,     1,    89,   215,    91,    92,   217,   219,
-     112,    56,   113,   151,   215,   151,    61,   217,   219,   121,
-     122,   151,   112,    21,    22,     1,   148,   151,   215,    27,
-     152,   217,   219,   155,   156,   157,   158,   159,   215,   129,
-     162,   163,   219,   128,   191,   130,   131,   132,   133,     1,
-       1,   153,   208,   134,   135,   208,   206,    89,   214,   216,
-     216,   214,   147,    14,   216,   118,   216,   525,    66,    67,
-     206,   216,   117,     1,   216,    73,    74,    75,   216,    93,
-     202,   203,   204,    89,   216,   207,   171,    15,    16,   215,
-     212,    19,   216,   219,   216,   215,   181,    95,    96,   219,
-       1,     1,   192,     3,   206,     5,   120,     1,   215,   217,
-     108,   109,   219,    89,   216,   216,   206,    17,   215,   151,
-     218,   119,   219,   215,   209,   210,   216,   219,   215,   127,
-     588,   216,    32,   134,   135,    36,    36,    89,   596,   597,
-     178,   179,    93,   218,   218,   151,   218,   218,    76,    77,
-      78,   218,   218,    81,   218,    56,    56,    40,    58,   218,
-      61,    89,    13,     9,    10,    11,   218,    61,    68,   120,
-     218,   216,   100,   101,   206,   151,   218,   218,     1,    62,
-     214,    64,    33,   218,   216,   218,   215,   115,   116,    89,
-     218,   218,    43,   218,    17,  1018,  1019,  1020,    49,   151,
-     218,   218,   216,   218,   215,   218,   218,   213,   218,    32,
-     216,   218,   118,    36,    65,   143,   117,   117,   216,   102,
-     215,   218,     1,     1,   218,   218,   120,   218,     6,     7,
-       1,   218,   218,   218,    12,   218,   218,   213,   218,    90,
-     218,   218,    20,   218,   144,    24,    17,    98,    26,   218,
-      28,    29,    30,    99,   206,   218,   184,    35,   218,   218,
-     218,    32,   218,    41,    42,    36,    44,    45,    46,   218,
-     218,   171,    50,   218,   218,   218,   218,    55,    57,   218,
-     218,    59,    60,   218,   218,    63,   137,   218,   216,   112,
-     173,   174,   218,   218,    72,   218,   218,   218,   121,   122,
-     218,    79,    80,   154,    82,    83,    84,    85,    86,   209,
-      89,   218,    91,    92,   218,   218,   216,   118,    89,    97,
-     218,   218,   218,   206,    99,   103,   104,   105,   218,   107,
-     153,  1089,   110,   111,   218,    99,   114,   218,   218,   218,
-       1,   112,     3,   218,     5,   218,   218,   218,   218,   128,
-     218,   130,   131,   132,   133,     4,    17,   218,   129,   218,
-     218,   218,   218,   218,    64,   218,   218,   160,   147,    99,
-     148,    32,     1,   218,   152,    36,    25,   155,   156,   157,
-     158,   159,   218,   206,   162,   163,    15,    16,   218,   218,
-      19,    40,   171,    99,    99,    56,    99,    58,    47,   160,
-      99,   160,   181,    99,   160,   160,   215,    68,   138,   139,
-     140,   141,   142,   215,   218,    64,   118,   160,   218,   218,
-     218,   192,   218,   218,   202,   203,   204,   218,    89,   207,
-     209,   210,   218,   218,   212,   206,   136,   218,    87,   215,
-      99,   218,    51,   160,   218,    94,   218,    76,    77,    78,
-       0,     1,    81,   218,     4,   218,   117,   106,   218,   160,
-      89,   218,   215,    99,    14,   165,   218,    17,    18,   218,
-     218,   100,   101,    23,   174,   124,   125,   126,   218,     1,
-     180,   218,   218,   144,    34,   218,   115,   116,    38,    39,
-      51,   218,   218,   218,   194,   218,   196,   197,    48,   218,
-     218,   118,   160,   160,    99,   205,    99,    99,   160,   160,
-     171,   211,    62,   160,   143,    37,    99,    99,    51,    99,
-      70,    71,    99,    99,   118,   174,    99,   160,   160,    51,
-      52,    53,    54,   218,   183,   160,   218,   160,    88,   188,
-     160,   160,   160,   118,   160,   194,   160,    69,   209,   198,
-     160,   200,   102,   160,   160,   184,   205,   166,   167,   168,
-     169,   170,   211,   172,   173,   215,   175,   176,   177,    64,
-     215,   180,   218,   182,   183,   218,   185,   218,   187,   218,
-     189,   190,   160,   218,   193,    99,   136,   218,   218,   217,
-     199,   218,   218,   215,   218,   145,   146,   218,   118,   149,
-     150,   118,   215,   218,   215,   166,   167,   168,   169,   170,
-     215,   172,   173,   215,   175,   176,   177,   218,   218,   180,
-     218,   182,   183,   160,   185,   160,   187,   218,   189,   190,
-     218,   218,   193,   166,   167,   168,   169,   170,   199,   172,
-     173,   136,   175,   176,   177,   118,   218,   180,     1,   182,
-     183,   201,   185,   218,   187,   218,   189,   190,   160,   160,
-     193,   215,   118,   160,   118,   118,   199,   118,    21,    22,
-     165,   118,   118,   118,    27,   118,   118,   118,   118,   174,
-     218,   215,   218,   215,   215,   180,   118,   215,   218,   215,
-     215,   215,   215,    99,   215,    99,   215,   215,    99,   194,
-     215,   196,   197,   215,   215,   215,   215,   215,   215,   215,
-     205,   215,   215,    66,    67,    99,   211,    99,    99,   118,
-      73,    74,    75,    99,    99,    99,   215,   118,   118,   160,
-     218,   118,   118,   118,    99,   118,   215,   215,   118,   118,
-     118,   118,    95,    96,   215,   118,   118,   118,   218,   215,
-     215,   215,   215,   215,   215,   108,   109,   215,   215,   118,
-     215,   118,    99,   215,   160,   215,   119,   215,   118,   218,
-     118,   215,   118,   118,   127,   118,   215,   215,   215,   215,
-     215,   215,   215,   118,   118,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,    99,
-     215,   118,   215,   215,   118,   215,   160,   215,   215,   118,
-     215,   118,   215,   118,   218,   118,   218,   215,   987,   218,
-     118,   118,   118,   118,   118,    71,   164,    99,   950,   985,
-    1226,   501,   123,  1199,  1197,   215,   215,   215,   328,   215,
-    1187,   218,   215,   215,   215,   215,   123,   215,   222,   215,
-     215,   215,  1084,   215,   215,   477,   215,   452,   215,   118,
-    1183,   515,   550,   215,   215,   215,   215,   215,  1201,   215,
-    1177,   558,   215,   215,  1203,   215,   358,   218,   215,   218,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,  1185,   215,
-     215,   467,   215,   215,   215,   215,   376,   215,   112,   215,
-    1179,   215,  1050,   215,   215,   166,   215,  1052,    91,   388,
-      -1,    -1,   215,   215,    -1,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,    -1,   215,    -1,    -1,
-     219,   215,   218,   218,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,    -1,   230,   215,   215,
-     218,   215,   215,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   243,    -1,    -1,    -1,    -1,    -1,    -1,
+     595,   596,   300,   301,     1,   214,   215,     8,   216,     1,
+     308,    99,     1,     1,     1,    51,     1,     1,   214,     1,
+       1,     1,   218,     1,   216,    14,   216,    24,   772,   773,
+     774,   775,   776,   216,    31,   214,   214,     1,   214,   218,
+     218,   214,     6,     7,     1,   218,   214,   216,    12,   216,
+     218,     1,     1,    37,   214,   214,    20,   214,   218,   218,
+       1,     1,    26,     1,    28,    29,    30,    51,    52,    53,
+      54,    35,   216,    61,    61,     1,    14,    41,    42,   216,
+      44,    45,    46,    61,   216,    69,    50,     1,     9,    10,
+      11,    55,    89,   391,   392,    59,    60,    89,    24,    63,
+       1,   399,    87,   401,    93,   216,   194,    89,    72,    89,
+     408,     1,    61,   411,   216,    79,    80,     1,    82,    83,
+      84,    85,    86,   216,   422,   423,   216,   119,   113,     1,
+     119,    57,   119,    97,   432,   433,   216,   435,   119,   103,
+     104,   105,   216,   107,   216,    17,   110,   111,    89,   185,
+     114,   216,    36,     1,   190,    93,   216,   214,   150,   217,
+      32,   218,   216,    89,    36,    91,    92,    15,    16,   150,
+     119,    19,    56,   159,   160,    89,   214,    61,    99,   119,
+     218,   119,   216,   147,     1,   217,    87,   151,     1,   190,
+     154,   155,   156,   157,   158,   217,     1,   161,   162,    89,
+      17,   127,   217,   129,   130,   131,   132,   214,   217,   150,
+     150,   218,   113,   159,   160,    32,    21,    22,   215,    36,
+     146,     1,    27,   215,   205,   523,   215,   215,    76,    77,
+      78,   215,   116,    81,   215,   215,   150,   201,   202,   203,
+     112,    89,   206,   217,   170,   133,   134,   211,   120,   121,
+     207,   215,   100,   101,   180,   217,   213,   207,   215,     1,
+     150,    66,    67,   213,   205,   205,   215,   115,    73,    74,
+      75,     1,    89,     3,   215,     5,    89,   214,     1,   213,
+     152,   218,   208,   209,   217,     1,   217,    17,   586,   215,
+      95,    96,   217,     1,   142,   112,   594,   217,   212,   217,
+       1,   215,    32,   108,   109,   217,    36,   217,   214,    89,
+     217,   128,   218,   118,   215,   214,    24,   217,   214,   218,
+      36,   126,   218,    31,   217,   215,    56,   214,    58,   133,
+     134,   215,   217,   205,   217,   183,    37,   150,    68,   217,
+      56,   177,   178,   215,     1,    61,   217,    89,   217,     1,
+      51,    52,    53,    54,  1013,  1014,  1015,   217,   217,    89,
+      17,   217,   217,   217,    99,    17,    89,   215,    69,   117,
+     150,   217,   217,   217,   191,    32,   217,   119,   217,    36,
+      32,    89,   217,   217,    36,   217,   116,   217,   205,     1,
+       1,   217,   217,   217,   217,     6,     7,   217,   215,   212,
+     116,    12,   137,   138,   139,   140,   141,   217,   150,    20,
+     215,   217,    24,   143,   217,    26,   217,    28,    29,    30,
+     217,   217,   217,   217,    35,   205,   217,   150,   217,   217,
+      41,    42,   217,    44,    45,    46,   217,    89,   217,    50,
+     170,   217,   217,    40,    55,    57,   217,   217,    59,    60,
+     217,   217,    63,   217,   217,   112,   217,   217,   217,   217,
+     112,    72,   217,   120,   121,    62,   217,    64,    79,    80,
+     217,    82,    83,    84,    85,    86,   128,    89,   208,    91,
+      92,   217,   214,   217,   217,   215,    97,   117,   217,  1084,
+     217,   217,   103,   104,   105,   152,   107,   217,   217,   110,
+     111,   117,   217,   114,   217,   102,     1,   217,     3,    99,
+       5,   217,   217,   217,   217,   127,   214,   129,   130,   131,
+     132,     4,    17,   217,   217,   217,   217,   217,    64,    99,
+     159,    99,    99,    99,   146,    99,   147,    32,   159,   191,
+     151,    36,    25,   154,   155,   156,   157,   158,   205,   159,
+     161,   162,    99,   205,   159,   159,   214,    40,   170,   214,
+     214,    56,   117,    58,    47,   214,   217,   217,   180,   217,
+       1,   217,   217,    68,   217,   172,   173,   217,   217,   217,
+     217,    64,   217,   217,    15,    16,   217,   159,    19,   217,
+     201,   202,   203,    64,    89,   206,   208,   209,   217,   135,
+     211,    99,   217,   217,    87,   159,   159,    99,   205,   217,
+     217,    94,   117,   159,   217,     0,     1,   217,   217,     4,
+     159,   116,   217,   106,   217,   217,   217,    99,   164,    14,
+     217,   217,    17,    18,   217,    99,    99,   173,    23,   159,
+     123,   124,   125,   179,   159,    76,    77,    78,   143,    34,
+      81,    51,   159,    38,    39,    99,    99,   193,    89,   195,
+     196,    99,    99,    48,   135,   117,    99,    99,   204,   100,
+     101,   159,   159,   217,   210,   170,   217,    62,   159,    51,
+     159,   159,   159,   159,   115,    70,    71,   117,   214,   159,
+     173,   159,   159,   164,   159,   214,   217,   159,   159,   182,
+     217,   217,   173,    88,   187,   217,    13,    51,   179,   217,
+     193,   142,   216,   208,   197,   217,   199,   102,   217,   117,
+     217,   204,   193,   217,   195,   196,    33,   210,   214,   117,
+     214,   159,   217,   204,   159,   217,    43,   217,   117,   210,
+     214,   214,    49,   159,   159,   159,   117,   117,   217,   117,
+     135,   217,   183,   117,   117,   214,   214,   217,    65,   144,
+     145,   217,   217,   148,   149,   165,   166,   167,   168,   169,
+     217,   171,   172,    99,   174,   175,   176,   217,   217,   179,
+     117,   181,   182,    90,   184,     1,   186,   117,   188,   189,
+     217,    98,   192,   165,   166,   167,   168,   169,   198,   171,
+     172,   117,   174,   175,   176,    21,    22,   179,   117,   181,
+     182,    27,   184,   117,   186,   200,   188,   189,   117,   214,
+     192,   165,   166,   167,   168,   169,   198,   171,   172,   136,
+     174,   175,   176,   214,   217,   179,   117,   181,   182,   217,
+     184,   214,   186,   217,   188,   189,   153,   214,   192,   214,
+      66,    67,   214,   214,   198,   214,   214,    73,    74,    75,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+      99,   214,   214,    99,    99,    99,    99,    99,   117,    95,
+      96,    99,    99,   214,    99,   117,   117,   159,   217,   117,
+     117,    99,   108,   109,   214,   214,   117,   117,   117,   214,
+     217,   214,   118,   117,   117,   117,   117,   117,   117,   214,
+     126,   214,   214,   214,   214,   117,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   117,   214,   214,   214,   214,   214,   214,
+     214,   214,    99,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   159,   117,   117,   217,   117,   214,   117,   217,
+     117,   214,   217,   117,   117,    99,   214,   214,   214,   214,
+     117,   159,   117,   217,   117,   117,   117,   217,   117,   117,
+     117,   117,   117,   983,   117,    71,  1221,   230,   981,   946,
+     122,  1194,   327,   499,  1192,   122,    99,   214,   214,   214,
+     214,   214,  1182,   214,   214,   214,   214,   267,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     117,  1079,   214,   475,   217,   214,   217,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   163,   214,   214,
+     450,  1178,   214,   513,   214,  1196,   214,   556,   214,   214,
+    1198,  1172,   214,   214,   214,   214,   214,  1180,   214,   465,
+     214,   112,  1174,   166,   214,  1045,  1047,    91,    -1,    -1,
+      -1,   548,    -1,   214,   214,   214,   214,    -1,   214,   214,
+     214,    -1,   214,    -1,    -1,   218,   217,   217,   217,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,    -1,   214,   214,   214,   214,   214,    -1,   374,    -1,
+      -1,    -1,    -1,    -1,    -1,   386,   222,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   243,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   288
+      -1,    -1,    -1,    -1,    -1,    -1,   356,    -1,    -1,    -1,
+     288
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   221,     0,     1,     4,    14,    17,    18,    23,    34,
-      38,    39,    48,    62,    70,    71,    88,   102,   136,   145,
-     146,   149,   150,   201,   222,   227,   232,   254,   260,   274,
-     292,   310,   324,   339,   346,   350,   360,   369,   389,   399,
-     405,   409,   419,   477,   494,   215,   216,   217,   217,   293,
-     370,   400,   217,   410,   217,   325,   390,   311,   217,   217,
-     275,   340,   217,   217,   351,   361,   217,     1,    24,    31,
-      89,   255,   256,   257,   258,   259,     1,    21,    22,    27,
-      66,    67,    73,    74,    75,    95,    96,   108,   109,   119,
-     127,   478,   479,   480,   481,   482,   483,   484,   485,   486,
-     487,   488,   489,   490,   491,   492,   493,   217,   217,   217,
-       1,    61,   406,   407,   408,   217,     1,     6,     7,    12,
+       0,   220,     0,     1,     4,    14,    17,    18,    23,    34,
+      38,    39,    48,    62,    70,    71,    88,   102,   135,   144,
+     145,   148,   149,   200,   221,   226,   231,   253,   259,   273,
+     291,   308,   322,   337,   344,   348,   358,   367,   387,   397,
+     403,   407,   417,   475,   492,   214,   215,   216,   216,   292,
+     368,   398,   216,   408,   216,   323,   388,   309,   216,   216,
+     274,   338,   216,   216,   349,   359,   216,     1,    24,    31,
+      89,   254,   255,   256,   257,   258,     1,    21,    22,    27,
+      66,    67,    73,    74,    75,    95,    96,   108,   109,   118,
+     126,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   216,   216,   216,
+       1,    61,   404,   405,   406,   216,     1,     6,     7,    12,
       20,    26,    28,    29,    30,    35,    41,    42,    44,    45,
       46,    50,    55,    59,    60,    63,    72,    79,    80,    82,
       83,    84,    85,    86,    97,   103,   104,   105,   107,   110,
-     111,   114,   148,   152,   155,   156,   157,   158,   159,   162,
-     163,   202,   203,   204,   207,   212,   420,   421,   422,   423,
-     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-     464,   465,   466,   470,   474,   475,   476,   217,   217,   217,
-       1,   208,   261,   262,   263,   264,   265,     1,    87,   113,
-     228,   229,   230,   231,   217,   217,     1,    37,    51,    52,
-      53,    54,    69,   495,   496,   497,   498,   499,   500,   501,
-     502,     1,    24,    57,    89,    91,    92,   128,   130,   131,
-     132,   133,   147,   171,   181,   209,   210,   233,   234,   235,
-     236,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   217,   217,     1,    89,   347,   348,
-     349,   215,   218,   218,   218,   216,   256,   218,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   216,   479,     1,    15,    16,    19,    76,    77,    78,
-      81,    89,   100,   101,   115,   116,   143,   184,   294,   295,
+     111,   114,   147,   151,   154,   155,   156,   157,   158,   161,
+     162,   201,   202,   203,   206,   211,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,   468,   472,   473,   474,   216,   216,   216,
+       1,   207,   260,   261,   262,   263,   264,     1,    87,   113,
+     227,   228,   229,   230,   216,   216,     1,    37,    51,    52,
+      53,    54,    69,   493,   494,   495,   496,   497,   498,   499,
+     500,     1,    24,    57,    89,    91,    92,   127,   129,   130,
+     131,   132,   146,   170,   180,   208,   209,   232,   233,   234,
+     235,   240,   241,   242,   243,   244,   245,   246,   247,   248,
+     249,   250,   251,   252,   216,   216,     1,    89,   345,   346,
+     347,   214,   217,   217,   217,   215,   255,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   215,   477,     1,    15,    16,    19,    76,    77,    78,
+      81,    89,   100,   101,   115,   142,   183,   293,   294,   295,
      296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,     1,     3,     5,    17,    32,    36,
-      56,    58,    68,    89,   117,   144,   171,   209,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   384,   385,
-     386,   387,   388,     1,    61,   120,   401,   402,   403,   404,
-     218,   216,   407,     1,    89,   120,   151,   411,   415,   416,
-     417,   418,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   471,   218,   467,   218,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   216,   421,     1,    17,    32,    36,   112,   121,   122,
-     153,   206,   326,   327,   328,   329,   330,   331,   332,   336,
-     337,   338,     1,   120,   151,   206,   391,   395,   396,   397,
-     398,     1,    36,    56,    61,   117,   312,   316,   317,   318,
-     322,   323,   215,   218,   216,   262,   214,   215,   218,   218,
-     216,   229,     1,    17,    32,    36,    89,   112,   129,   192,
-     206,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     288,     1,    14,    93,   120,   341,   342,   343,   344,   345,
-     218,   218,   218,   218,   218,   218,   216,   496,   215,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   216,   234,     1,    89,   151,   206,
-     352,   353,   354,   355,   356,     1,    89,   151,   362,   363,
-     364,   365,   218,   216,   348,   118,   118,   118,   215,    99,
-      99,   160,    99,   224,   224,    99,    99,    99,   160,   160,
-      99,   224,   160,   160,   215,   215,   218,   218,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     216,   295,   215,   218,   218,   218,   218,   381,   218,   218,
-     218,   218,   218,   218,   218,   218,   216,   372,   218,   218,
-     216,   402,   118,   215,   218,   218,   412,   216,   416,   160,
-     224,   224,    99,   160,   160,    99,   118,   160,   224,   160,
-     224,    99,    99,    99,   160,   160,   160,   224,    99,    99,
-     224,    99,    99,   118,    99,    99,   160,   160,   218,   160,
-     218,   224,   224,   160,   160,   160,   160,   160,   161,   160,
-     161,   160,   160,   224,   224,   118,   224,   160,   160,   160,
-     215,   215,   218,   218,   333,   218,   218,   218,   218,   218,
-     216,   327,   218,   392,   218,   216,   396,   215,   313,   218,
-     218,   218,   216,   317,   160,   215,   217,   118,   118,   215,
-     215,   218,   218,   289,   218,   218,   218,   285,   218,   216,
-     277,   215,   218,   218,   218,   216,   342,   160,   160,   118,
-     160,   160,   224,   215,   118,   160,   118,   118,   118,   118,
-     118,   118,   134,   135,   237,   238,   134,   135,   239,   240,
-     118,   118,    99,   118,   118,   215,   215,   218,   357,   218,
-     216,   353,   215,   218,   366,   216,   363,   118,   215,   215,
-     215,   215,   215,   215,   215,   138,   139,   140,   141,   142,
-     223,   224,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,    99,    99,   224,    99,    99,    99,    99,
-     118,    99,    99,   224,   224,    99,   226,   226,   215,   118,
-     178,   179,   118,   160,   218,   118,   118,   118,   118,    99,
-     118,   118,   118,   215,   118,   118,   215,   215,   118,   118,
-     218,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,    51,   166,   167,   168,   169,   170,   172,   173,   175,
-     176,   177,   180,   182,   183,   185,   187,   189,   190,   193,
-     199,   472,   473,   215,    51,   166,   167,   168,   169,   170,
-     172,   173,   175,   176,   177,   180,   182,   183,   185,   187,
-     189,   190,   193,   199,   468,   469,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   118,   160,   218,   118,    99,
-     118,   118,   118,   215,   118,   218,   118,   215,   218,   118,
-     118,    99,   320,   321,   215,   215,     1,    89,   151,   213,
-     266,   267,   268,   269,   270,   215,   215,   118,   160,   218,
-     118,   118,   118,   218,   118,   215,   118,   118,   118,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   219,   215,   219,   215,   215,
-     215,   215,   215,   118,   218,   118,   215,   118,   218,   215,
-     215,   223,   223,   223,   223,   223,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,     9,    10,
-      11,   225,   226,   215,   215,   215,   215,   215,   215,   215,
-       8,   191,   382,   383,   215,   215,   215,   215,   215,   215,
-     215,   215,   215,   215,   215,   215,   123,   413,   414,   215,
-     219,   215,   219,   215,   215,    13,    33,    43,    49,    65,
-      90,    98,   137,   154,   334,   335,   215,   215,   215,   215,
-     215,   215,   123,   393,   394,   215,    51,   186,   191,   314,
-     315,   215,   215,   164,   219,   319,   215,   218,   271,   218,
-     216,   267,   215,   215,     4,    25,    40,    47,    64,    87,
-      94,   106,   124,   125,   126,   174,   183,   188,   194,   198,
-     200,   205,   211,   290,   291,   215,   215,   215,    51,   166,
-     167,   168,   169,   170,   172,   173,   175,   176,   177,   180,
-     182,   183,   185,   187,   189,   190,   193,   199,   286,   287,
-     215,   215,   215,   215,   238,   240,   215,    64,   136,   165,
-     174,   180,   194,   196,   197,   205,   211,   358,   359,   215,
-     215,    64,   136,   165,   174,   180,   194,   196,   197,   205,
-     211,   367,   368,   225,   225,   225,   215,   219,   215,   219,
-     473,   469,   215,   219,   215,   219,   215,   219,    99,   321,
-     215,   118,   218,   195,   226,   215,   215,   219,   215,   219,
-     215,   219,   215,   219,   383,   414,   335,   394,   315,   215,
-      40,    62,    64,   102,   173,   174,   206,   272,   273,   215,
-     215,   291,   287,   359,   368,   215,   219,   273
+     306,   307,     1,     3,     5,    17,    32,    36,    56,    58,
+      68,    89,   116,   143,   170,   208,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,   382,   383,   384,   385,
+     386,     1,    61,   119,   399,   400,   401,   402,   217,   215,
+     405,     1,    89,   119,   150,   409,   413,   414,   415,   416,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   469,
+     217,   465,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   215,
+     419,     1,    17,    32,    36,   112,   120,   121,   152,   205,
+     324,   325,   326,   327,   328,   329,   330,   334,   335,   336,
+       1,   119,   150,   205,   389,   393,   394,   395,   396,     1,
+      36,    56,    61,   116,   310,   314,   315,   316,   320,   321,
+     214,   217,   215,   261,   213,   214,   217,   217,   215,   228,
+       1,    17,    32,    36,    89,   112,   128,   191,   205,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   287,     1,
+      14,    93,   119,   339,   340,   341,   342,   343,   217,   217,
+     217,   217,   217,   217,   215,   494,   214,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   215,   233,     1,    89,   150,   205,   350,   351,
+     352,   353,   354,     1,    89,   150,   360,   361,   362,   363,
+     217,   215,   346,   117,   117,   117,   214,    99,    99,   159,
+      99,   223,   223,    99,    99,    99,   159,   159,    99,   223,
+     159,   159,   214,   214,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   215,   294,   214,
+     217,   217,   217,   217,   379,   217,   217,   217,   217,   217,
+     217,   217,   217,   215,   370,   217,   217,   215,   400,   117,
+     214,   217,   217,   410,   215,   414,   159,   223,   223,    99,
+     159,   159,    99,   117,   159,   223,   159,   223,    99,    99,
+      99,   159,   159,   159,   223,    99,    99,   223,    99,    99,
+     117,    99,    99,   159,   159,   217,   159,   217,   223,   223,
+     159,   159,   159,   159,   159,   160,   159,   160,   159,   159,
+     223,   223,   117,   223,   159,   159,   159,   214,   214,   217,
+     217,   331,   217,   217,   217,   217,   217,   215,   325,   217,
+     390,   217,   215,   394,   214,   311,   217,   217,   217,   215,
+     315,   159,   214,   216,   117,   117,   214,   214,   217,   217,
+     288,   217,   217,   217,   284,   217,   215,   276,   214,   217,
+     217,   217,   215,   340,   159,   159,   117,   159,   159,   223,
+     214,   117,   159,   117,   117,   117,   117,   117,   117,   133,
+     134,   236,   237,   133,   134,   238,   239,   117,   117,    99,
+     117,   117,   214,   214,   217,   355,   217,   215,   351,   214,
+     217,   364,   215,   361,   117,   214,   214,   214,   214,   214,
+     214,   214,   137,   138,   139,   140,   141,   222,   223,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+      99,    99,   223,    99,    99,    99,    99,   117,    99,    99,
+     223,    99,   225,   225,   214,   117,   177,   178,   117,   159,
+     217,   117,   117,   117,   117,    99,   117,   117,   117,   214,
+     117,   117,   214,   214,   117,   117,   217,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,    51,   165,   166,
+     167,   168,   169,   171,   172,   174,   175,   176,   179,   181,
+     182,   184,   186,   188,   189,   192,   198,   470,   471,   214,
+      51,   165,   166,   167,   168,   169,   171,   172,   174,   175,
+     176,   179,   181,   182,   184,   186,   188,   189,   192,   198,
+     466,   467,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   117,   159,   217,   117,    99,   117,   117,   117,   214,
+     117,   217,   117,   214,   217,   117,   117,    99,   318,   319,
+     214,   214,     1,    89,   150,   212,   265,   266,   267,   268,
+     269,   214,   214,   117,   159,   217,   117,   117,   117,   217,
+     117,   214,   117,   117,   117,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   218,   214,   218,   214,   214,   214,   214,   214,   117,
+     217,   117,   214,   117,   217,   214,   214,   222,   222,   222,
+     222,   222,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,     9,    10,    11,   224,   225,   214,   214,
+     214,   214,   214,   214,   214,     8,   190,   380,   381,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   122,   411,   412,   214,   218,   214,   218,   214,   214,
+      13,    33,    43,    49,    65,    90,    98,   136,   153,   332,
+     333,   214,   214,   214,   214,   214,   214,   122,   391,   392,
+     214,    51,   185,   190,   312,   313,   214,   214,   163,   218,
+     317,   214,   217,   270,   217,   215,   266,   214,   214,     4,
+      25,    40,    47,    64,    87,    94,   106,   123,   124,   125,
+     173,   182,   187,   193,   197,   199,   204,   210,   289,   290,
+     214,   214,   214,    51,   165,   166,   167,   168,   169,   171,
+     172,   174,   175,   176,   179,   181,   182,   184,   186,   188,
+     189,   192,   198,   285,   286,   214,   214,   214,   214,   237,
+     239,   214,    64,   135,   164,   173,   179,   193,   195,   196,
+     204,   210,   356,   357,   214,   214,    64,   135,   164,   173,
+     179,   193,   195,   196,   204,   210,   365,   366,   224,   224,
+     224,   214,   218,   214,   218,   471,   467,   214,   218,   214,
+     218,   214,   218,    99,   319,   214,   117,   217,   194,   225,
+     214,   214,   218,   214,   218,   214,   218,   214,   218,   381,
+     412,   333,   392,   313,   214,    40,    62,    64,   102,   172,
+     173,   205,   271,   272,   214,   214,   290,   286,   357,   366,
+     214,   218,   272
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3138,13 +3132,13 @@ yyreduce:
     {
         case 26:
 /* Line 1813 of yacc.c  */
-#line 358 "conf_parser.y"
+#line 357 "conf_parser.y"
     { (yyval.number) = 0; }
     break;
 
   case 28:
 /* Line 1813 of yacc.c  */
-#line 360 "conf_parser.y"
+#line 359 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
 		}
@@ -3152,7 +3146,7 @@ yyreduce:
 
   case 29:
 /* Line 1813 of yacc.c  */
-#line 364 "conf_parser.y"
+#line 363 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
 		}
@@ -3160,7 +3154,7 @@ yyreduce:
 
   case 30:
 /* Line 1813 of yacc.c  */
-#line 368 "conf_parser.y"
+#line 367 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
 		}
@@ -3168,7 +3162,7 @@ yyreduce:
 
   case 31:
 /* Line 1813 of yacc.c  */
-#line 372 "conf_parser.y"
+#line 371 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
 		}
@@ -3176,7 +3170,7 @@ yyreduce:
 
   case 32:
 /* Line 1813 of yacc.c  */
-#line 376 "conf_parser.y"
+#line 375 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
 		}
@@ -3184,7 +3178,7 @@ yyreduce:
 
   case 33:
 /* Line 1813 of yacc.c  */
-#line 380 "conf_parser.y"
+#line 379 "conf_parser.y"
     {
 			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
 		}
@@ -3192,37 +3186,37 @@ yyreduce:
 
   case 34:
 /* Line 1813 of yacc.c  */
-#line 385 "conf_parser.y"
+#line 384 "conf_parser.y"
     { (yyval.number) = 0; }
     break;
 
   case 36:
 /* Line 1813 of yacc.c  */
-#line 386 "conf_parser.y"
+#line 385 "conf_parser.y"
     { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
     break;
 
   case 37:
 /* Line 1813 of yacc.c  */
-#line 387 "conf_parser.y"
+#line 386 "conf_parser.y"
     { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
     break;
 
   case 38:
 /* Line 1813 of yacc.c  */
-#line 388 "conf_parser.y"
+#line 387 "conf_parser.y"
     { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
     break;
 
   case 39:
 /* Line 1813 of yacc.c  */
-#line 389 "conf_parser.y"
+#line 388 "conf_parser.y"
     { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
     break;
 
   case 46:
 /* Line 1813 of yacc.c  */
-#line 403 "conf_parser.y"
+#line 402 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     add_conf_module(libio_basename(yylval.string));
@@ -3231,7 +3225,7 @@ yyreduce:
 
   case 47:
 /* Line 1813 of yacc.c  */
-#line 409 "conf_parser.y"
+#line 408 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     mod_add_path(yylval.string);
@@ -3240,7 +3234,7 @@ yyreduce:
 
   case 71:
 /* Line 1813 of yacc.c  */
-#line 434 "conf_parser.y"
+#line 433 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
@@ -3251,7 +3245,7 @@ yyreduce:
 
   case 72:
 /* Line 1813 of yacc.c  */
-#line 440 "conf_parser.y"
+#line 439 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
@@ -3262,7 +3256,7 @@ yyreduce:
 
   case 75:
 /* Line 1813 of yacc.c  */
-#line 449 "conf_parser.y"
+#line 448 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
@@ -3273,7 +3267,7 @@ yyreduce:
 
   case 76:
 /* Line 1813 of yacc.c  */
-#line 455 "conf_parser.y"
+#line 454 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
@@ -3284,7 +3278,7 @@ yyreduce:
 
   case 77:
 /* Line 1813 of yacc.c  */
-#line 463 "conf_parser.y"
+#line 462 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) 
@@ -3326,7 +3320,7 @@ yyreduce:
 
   case 78:
 /* Line 1813 of yacc.c  */
-#line 502 "conf_parser.y"
+#line 501 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 1)
@@ -3388,7 +3382,7 @@ yyreduce:
 
   case 79:
 /* Line 1813 of yacc.c  */
-#line 561 "conf_parser.y"
+#line 560 "conf_parser.y"
     {
 /* TBD - XXX: error reporting */
 #ifdef HAVE_LIBCRYPTO
@@ -3419,7 +3413,7 @@ yyreduce:
 
   case 80:
 /* Line 1813 of yacc.c  */
-#line 589 "conf_parser.y"
+#line 588 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
@@ -3430,7 +3424,7 @@ yyreduce:
 
   case 81:
 /* Line 1813 of yacc.c  */
-#line 597 "conf_parser.y"
+#line 596 "conf_parser.y"
     {
   /* this isn't rehashable */
   if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
@@ -3448,7 +3442,7 @@ yyreduce:
 
   case 82:
 /* Line 1813 of yacc.c  */
-#line 612 "conf_parser.y"
+#line 611 "conf_parser.y"
     {
   /* this isn't rehashable */
   if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
@@ -3466,7 +3460,7 @@ yyreduce:
 
   case 83:
 /* Line 1813 of yacc.c  */
-#line 627 "conf_parser.y"
+#line 626 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3478,7 +3472,7 @@ yyreduce:
 
   case 84:
 /* Line 1813 of yacc.c  */
-#line 636 "conf_parser.y"
+#line 635 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3495,7 +3489,7 @@ yyreduce:
 
   case 85:
 /* Line 1813 of yacc.c  */
-#line 650 "conf_parser.y"
+#line 649 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3507,7 +3501,7 @@ yyreduce:
 
   case 86:
 /* Line 1813 of yacc.c  */
-#line 659 "conf_parser.y"
+#line 658 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
   {
@@ -3538,7 +3532,7 @@ yyreduce:
 
   case 87:
 /* Line 1813 of yacc.c  */
-#line 687 "conf_parser.y"
+#line 686 "conf_parser.y"
     {
 #ifdef IPV6
   if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
@@ -3571,7 +3565,7 @@ yyreduce:
 
   case 88:
 /* Line 1813 of yacc.c  */
-#line 717 "conf_parser.y"
+#line 716 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3597,7 +3591,7 @@ yyreduce:
 
   case 89:
 /* Line 1813 of yacc.c  */
-#line 740 "conf_parser.y"
+#line 739 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ServerInfo.hub = yylval.number;
@@ -3606,7 +3600,7 @@ yyreduce:
 
   case 97:
 /* Line 1813 of yacc.c  */
-#line 755 "conf_parser.y"
+#line 754 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3618,7 +3612,7 @@ yyreduce:
 
   case 98:
 /* Line 1813 of yacc.c  */
-#line 764 "conf_parser.y"
+#line 763 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3630,7 +3624,7 @@ yyreduce:
 
   case 99:
 /* Line 1813 of yacc.c  */
-#line 773 "conf_parser.y"
+#line 772 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3642,7 +3636,7 @@ yyreduce:
 
   case 106:
 /* Line 1813 of yacc.c  */
-#line 791 "conf_parser.y"
+#line 790 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigLoggingEntry.use_logging = yylval.number;
@@ -3651,7 +3645,7 @@ yyreduce:
 
   case 107:
 /* Line 1813 of yacc.c  */
-#line 797 "conf_parser.y"
+#line 796 "conf_parser.y"
     {
   lfile[0] = '\0';
   ltype = 0;
@@ -3661,7 +3655,7 @@ yyreduce:
 
   case 108:
 /* Line 1813 of yacc.c  */
-#line 802 "conf_parser.y"
+#line 801 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2 && ltype > 0)
     log_add_file(ltype, lsize, lfile);
@@ -3670,7 +3664,7 @@ yyreduce:
 
   case 115:
 /* Line 1813 of yacc.c  */
-#line 814 "conf_parser.y"
+#line 813 "conf_parser.y"
     {
   strlcpy(lfile, yylval.string, sizeof(lfile));
 }
@@ -3678,7 +3672,7 @@ yyreduce:
 
   case 116:
 /* Line 1813 of yacc.c  */
-#line 819 "conf_parser.y"
+#line 818 "conf_parser.y"
     {
   lsize = (yyvsp[(3) - (4)].number);
 }
@@ -3686,7 +3680,7 @@ yyreduce:
 
   case 117:
 /* Line 1813 of yacc.c  */
-#line 822 "conf_parser.y"
+#line 821 "conf_parser.y"
     {
   lsize = 0;
 }
@@ -3694,7 +3688,7 @@ yyreduce:
 
   case 118:
 /* Line 1813 of yacc.c  */
-#line 827 "conf_parser.y"
+#line 826 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = 0;
@@ -3703,7 +3697,7 @@ yyreduce:
 
   case 122:
 /* Line 1813 of yacc.c  */
-#line 834 "conf_parser.y"
+#line 833 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_USER;
@@ -3712,7 +3706,7 @@ yyreduce:
 
   case 123:
 /* Line 1813 of yacc.c  */
-#line 838 "conf_parser.y"
+#line 837 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_OPER;
@@ -3721,7 +3715,7 @@ yyreduce:
 
   case 124:
 /* Line 1813 of yacc.c  */
-#line 842 "conf_parser.y"
+#line 841 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_GLINE;
@@ -3730,7 +3724,7 @@ yyreduce:
 
   case 125:
 /* Line 1813 of yacc.c  */
-#line 846 "conf_parser.y"
+#line 845 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_DLINE;
@@ -3739,7 +3733,7 @@ yyreduce:
 
   case 126:
 /* Line 1813 of yacc.c  */
-#line 850 "conf_parser.y"
+#line 849 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_KLINE;
@@ -3748,7 +3742,7 @@ yyreduce:
 
   case 127:
 /* Line 1813 of yacc.c  */
-#line 854 "conf_parser.y"
+#line 853 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_KILL;
@@ -3757,7 +3751,7 @@ yyreduce:
 
   case 128:
 /* Line 1813 of yacc.c  */
-#line 858 "conf_parser.y"
+#line 857 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ltype = LOG_TYPE_DEBUG;
@@ -3766,7 +3760,7 @@ yyreduce:
 
   case 129:
 /* Line 1813 of yacc.c  */
-#line 868 "conf_parser.y"
+#line 867 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3783,7 +3777,7 @@ yyreduce:
 
   case 130:
 /* Line 1813 of yacc.c  */
-#line 880 "conf_parser.y"
+#line 879 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3866,7 +3860,7 @@ yyreduce:
 
   case 142:
 /* Line 1813 of yacc.c  */
-#line 965 "conf_parser.y"
+#line 964 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3878,7 +3872,7 @@ yyreduce:
 
   case 143:
 /* Line 1813 of yacc.c  */
-#line 974 "conf_parser.y"
+#line 973 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3918,7 +3912,7 @@ yyreduce:
 
   case 144:
 /* Line 1813 of yacc.c  */
-#line 1011 "conf_parser.y"
+#line 1010 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3933,7 +3927,7 @@ yyreduce:
 
   case 145:
 /* Line 1813 of yacc.c  */
-#line 1023 "conf_parser.y"
+#line 1022 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -3947,7 +3941,7 @@ yyreduce:
 
   case 146:
 /* Line 1813 of yacc.c  */
-#line 1034 "conf_parser.y"
+#line 1033 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2)
@@ -3992,7 +3986,7 @@ yyreduce:
 
   case 147:
 /* Line 1813 of yacc.c  */
-#line 1076 "conf_parser.y"
+#line 1075 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4004,7 +3998,7 @@ yyreduce:
 
   case 148:
 /* Line 1813 of yacc.c  */
-#line 1085 "conf_parser.y"
+#line 1084 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes = 0;
@@ -4013,7 +4007,7 @@ yyreduce:
 
   case 152:
 /* Line 1813 of yacc.c  */
-#line 1092 "conf_parser.y"
+#line 1091 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_BOTS;
@@ -4022,7 +4016,7 @@ yyreduce:
 
   case 153:
 /* Line 1813 of yacc.c  */
-#line 1096 "conf_parser.y"
+#line 1095 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_CCONN;
@@ -4031,7 +4025,7 @@ yyreduce:
 
   case 154:
 /* Line 1813 of yacc.c  */
-#line 1100 "conf_parser.y"
+#line 1099 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_CCONN_FULL;
@@ -4040,7 +4034,7 @@ yyreduce:
 
   case 155:
 /* Line 1813 of yacc.c  */
-#line 1104 "conf_parser.y"
+#line 1103 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_DEAF;
@@ -4049,7 +4043,7 @@ yyreduce:
 
   case 156:
 /* Line 1813 of yacc.c  */
-#line 1108 "conf_parser.y"
+#line 1107 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_DEBUG;
@@ -4058,7 +4052,7 @@ yyreduce:
 
   case 157:
 /* Line 1813 of yacc.c  */
-#line 1112 "conf_parser.y"
+#line 1111 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_FULL;
@@ -4067,7 +4061,7 @@ yyreduce:
 
   case 158:
 /* Line 1813 of yacc.c  */
-#line 1116 "conf_parser.y"
+#line 1115 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_HIDDEN;
@@ -4076,7 +4070,7 @@ yyreduce:
 
   case 159:
 /* Line 1813 of yacc.c  */
-#line 1120 "conf_parser.y"
+#line 1119 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_SKILL;
@@ -4085,7 +4079,7 @@ yyreduce:
 
   case 160:
 /* Line 1813 of yacc.c  */
-#line 1124 "conf_parser.y"
+#line 1123 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_NCHANGE;
@@ -4094,7 +4088,7 @@ yyreduce:
 
   case 161:
 /* Line 1813 of yacc.c  */
-#line 1128 "conf_parser.y"
+#line 1127 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_REJ;
@@ -4103,7 +4097,7 @@ yyreduce:
 
   case 162:
 /* Line 1813 of yacc.c  */
-#line 1132 "conf_parser.y"
+#line 1131 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_UNAUTH;
@@ -4112,7 +4106,7 @@ yyreduce:
 
   case 163:
 /* Line 1813 of yacc.c  */
-#line 1136 "conf_parser.y"
+#line 1135 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_SPY;
@@ -4121,7 +4115,7 @@ yyreduce:
 
   case 164:
 /* Line 1813 of yacc.c  */
-#line 1140 "conf_parser.y"
+#line 1139 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_EXTERNAL;
@@ -4130,7 +4124,7 @@ yyreduce:
 
   case 165:
 /* Line 1813 of yacc.c  */
-#line 1144 "conf_parser.y"
+#line 1143 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_OPERWALL;
@@ -4139,7 +4133,7 @@ yyreduce:
 
   case 166:
 /* Line 1813 of yacc.c  */
-#line 1148 "conf_parser.y"
+#line 1147 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_SERVNOTICE;
@@ -4148,7 +4142,7 @@ yyreduce:
 
   case 167:
 /* Line 1813 of yacc.c  */
-#line 1152 "conf_parser.y"
+#line 1151 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_INVISIBLE;
@@ -4157,7 +4151,7 @@ yyreduce:
 
   case 168:
 /* Line 1813 of yacc.c  */
-#line 1156 "conf_parser.y"
+#line 1155 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_WALLOP;
@@ -4166,7 +4160,7 @@ yyreduce:
 
   case 169:
 /* Line 1813 of yacc.c  */
-#line 1160 "conf_parser.y"
+#line 1159 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_SOFTCALLERID;
@@ -4175,7 +4169,7 @@ yyreduce:
 
   case 170:
 /* Line 1813 of yacc.c  */
-#line 1164 "conf_parser.y"
+#line 1163 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_CALLERID;
@@ -4184,7 +4178,7 @@ yyreduce:
 
   case 171:
 /* Line 1813 of yacc.c  */
-#line 1168 "conf_parser.y"
+#line 1167 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->modes |= UMODE_LOCOPS;
@@ -4193,7 +4187,7 @@ yyreduce:
 
   case 172:
 /* Line 1813 of yacc.c  */
-#line 1174 "conf_parser.y"
+#line 1173 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port = 0;
@@ -4202,7 +4196,7 @@ yyreduce:
 
   case 176:
 /* Line 1813 of yacc.c  */
-#line 1181 "conf_parser.y"
+#line 1180 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_GLOBAL_KILL;
@@ -4211,7 +4205,7 @@ yyreduce:
 
   case 177:
 /* Line 1813 of yacc.c  */
-#line 1185 "conf_parser.y"
+#line 1184 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_REMOTE;
@@ -4220,7 +4214,7 @@ yyreduce:
 
   case 178:
 /* Line 1813 of yacc.c  */
-#line 1189 "conf_parser.y"
+#line 1188 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_K;
@@ -4229,7 +4223,7 @@ yyreduce:
 
   case 179:
 /* Line 1813 of yacc.c  */
-#line 1193 "conf_parser.y"
+#line 1192 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_UNKLINE;
@@ -4238,7 +4232,7 @@ yyreduce:
 
   case 180:
 /* Line 1813 of yacc.c  */
-#line 1197 "conf_parser.y"
+#line 1196 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_DLINE;
@@ -4247,7 +4241,7 @@ yyreduce:
 
   case 181:
 /* Line 1813 of yacc.c  */
-#line 1201 "conf_parser.y"
+#line 1200 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_UNDLINE;
@@ -4256,7 +4250,7 @@ yyreduce:
 
   case 182:
 /* Line 1813 of yacc.c  */
-#line 1205 "conf_parser.y"
+#line 1204 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_X;
@@ -4265,7 +4259,7 @@ yyreduce:
 
   case 183:
 /* Line 1813 of yacc.c  */
-#line 1209 "conf_parser.y"
+#line 1208 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_GLINE;
@@ -4274,7 +4268,7 @@ yyreduce:
 
   case 184:
 /* Line 1813 of yacc.c  */
-#line 1213 "conf_parser.y"
+#line 1212 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_DIE;
@@ -4283,7 +4277,7 @@ yyreduce:
 
   case 185:
 /* Line 1813 of yacc.c  */
-#line 1217 "conf_parser.y"
+#line 1216 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_RESTART;
@@ -4292,7 +4286,7 @@ yyreduce:
 
   case 186:
 /* Line 1813 of yacc.c  */
-#line 1221 "conf_parser.y"
+#line 1220 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_REHASH;
@@ -4301,7 +4295,7 @@ yyreduce:
 
   case 187:
 /* Line 1813 of yacc.c  */
-#line 1225 "conf_parser.y"
+#line 1224 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_ADMIN;
@@ -4310,7 +4304,7 @@ yyreduce:
 
   case 188:
 /* Line 1813 of yacc.c  */
-#line 1229 "conf_parser.y"
+#line 1228 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_N;
@@ -4319,7 +4313,7 @@ yyreduce:
 
   case 189:
 /* Line 1813 of yacc.c  */
-#line 1233 "conf_parser.y"
+#line 1232 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_OPERWALL;
@@ -4328,7 +4322,7 @@ yyreduce:
 
   case 190:
 /* Line 1813 of yacc.c  */
-#line 1237 "conf_parser.y"
+#line 1236 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_GLOBOPS;
@@ -4337,7 +4331,7 @@ yyreduce:
 
   case 191:
 /* Line 1813 of yacc.c  */
-#line 1241 "conf_parser.y"
+#line 1240 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_OPER_SPY;
@@ -4346,7 +4340,7 @@ yyreduce:
 
   case 192:
 /* Line 1813 of yacc.c  */
-#line 1245 "conf_parser.y"
+#line 1244 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_REMOTEBAN;
@@ -4355,7 +4349,7 @@ yyreduce:
 
   case 193:
 /* Line 1813 of yacc.c  */
-#line 1249 "conf_parser.y"
+#line 1248 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_SET;
@@ -4364,7 +4358,7 @@ yyreduce:
 
   case 194:
 /* Line 1813 of yacc.c  */
-#line 1253 "conf_parser.y"
+#line 1252 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port |= OPER_FLAG_MODULE;
@@ -4373,7 +4367,7 @@ yyreduce:
 
   case 195:
 /* Line 1813 of yacc.c  */
-#line 1263 "conf_parser.y"
+#line 1262 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
   {
@@ -4384,7 +4378,7 @@ yyreduce:
 
   case 196:
 /* Line 1813 of yacc.c  */
-#line 1269 "conf_parser.y"
+#line 1268 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
   {
@@ -4425,9 +4419,9 @@ yyreduce:
 }
     break;
 
-  case 214:
+  case 213:
 /* Line 1813 of yacc.c  */
-#line 1324 "conf_parser.y"
+#line 1322 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
   {
@@ -4437,90 +4431,81 @@ yyreduce:
 }
     break;
 
-  case 215:
+  case 214:
 /* Line 1813 of yacc.c  */
-#line 1333 "conf_parser.y"
+#line 1331 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->ping_freq = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 216:
-/* Line 1813 of yacc.c  */
-#line 1339 "conf_parser.y"
-    {
-  if (conf_parser_ctx.pass == 1)
-    yy_class->ping_warning = (yyvsp[(3) - (4)].number);
-}
-    break;
-
-  case 217:
+  case 215:
 /* Line 1813 of yacc.c  */
-#line 1345 "conf_parser.y"
+#line 1337 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_perip = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 218:
+  case 216:
 /* Line 1813 of yacc.c  */
-#line 1351 "conf_parser.y"
+#line 1343 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->con_freq = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 219:
+  case 217:
 /* Line 1813 of yacc.c  */
-#line 1357 "conf_parser.y"
+#line 1349 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_total = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 220:
+  case 218:
 /* Line 1813 of yacc.c  */
-#line 1363 "conf_parser.y"
+#line 1355 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_global = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 221:
+  case 219:
 /* Line 1813 of yacc.c  */
-#line 1369 "conf_parser.y"
+#line 1361 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_local = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 222:
+  case 220:
 /* Line 1813 of yacc.c  */
-#line 1375 "conf_parser.y"
+#line 1367 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_ident = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 223:
+  case 221:
 /* Line 1813 of yacc.c  */
-#line 1381 "conf_parser.y"
+#line 1373 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->max_sendq = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 224:
+  case 222:
 /* Line 1813 of yacc.c  */
-#line 1387 "conf_parser.y"
+#line 1379 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX)
@@ -4528,36 +4513,36 @@ yyreduce:
 }
     break;
 
-  case 225:
+  case 223:
 /* Line 1813 of yacc.c  */
-#line 1394 "conf_parser.y"
+#line 1386 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->cidr_bitlen_ipv4 = (yyvsp[(3) - (4)].number) > 32 ? 32 : (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 226:
+  case 224:
 /* Line 1813 of yacc.c  */
-#line 1400 "conf_parser.y"
+#line 1392 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->cidr_bitlen_ipv6 = (yyvsp[(3) - (4)].number) > 128 ? 128 : (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 227:
+  case 225:
 /* Line 1813 of yacc.c  */
-#line 1406 "conf_parser.y"
+#line 1398 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 1)
     yy_class->number_per_cidr = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 228:
+  case 226:
 /* Line 1813 of yacc.c  */
-#line 1415 "conf_parser.y"
+#line 1407 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4567,9 +4552,9 @@ yyreduce:
 }
     break;
 
-  case 229:
+  case 227:
 /* Line 1813 of yacc.c  */
-#line 1422 "conf_parser.y"
+#line 1414 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4579,50 +4564,50 @@ yyreduce:
 }
     break;
 
-  case 230:
+  case 228:
 /* Line 1813 of yacc.c  */
-#line 1431 "conf_parser.y"
+#line 1423 "conf_parser.y"
     {
   listener_flags = 0;
 }
     break;
 
-  case 234:
+  case 232:
 /* Line 1813 of yacc.c  */
-#line 1437 "conf_parser.y"
+#line 1429 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     listener_flags |= LISTENER_SSL;
 }
     break;
 
-  case 235:
+  case 233:
 /* Line 1813 of yacc.c  */
-#line 1441 "conf_parser.y"
+#line 1433 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     listener_flags |= LISTENER_HIDDEN;
 }
     break;
 
-  case 236:
+  case 234:
 /* Line 1813 of yacc.c  */
-#line 1445 "conf_parser.y"
+#line 1437 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     listener_flags |= LISTENER_SERVER;
 }
     break;
 
-  case 244:
+  case 242:
 /* Line 1813 of yacc.c  */
-#line 1455 "conf_parser.y"
+#line 1447 "conf_parser.y"
     { listener_flags = 0; }
     break;
 
-  case 248:
+  case 246:
 /* Line 1813 of yacc.c  */
-#line 1460 "conf_parser.y"
+#line 1452 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4639,9 +4624,9 @@ yyreduce:
 }
     break;
 
-  case 249:
+  case 247:
 /* Line 1813 of yacc.c  */
-#line 1474 "conf_parser.y"
+#line 1466 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4662,9 +4647,9 @@ yyreduce:
 }
     break;
 
-  case 250:
+  case 248:
 /* Line 1813 of yacc.c  */
-#line 1494 "conf_parser.y"
+#line 1486 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4674,9 +4659,9 @@ yyreduce:
 }
     break;
 
-  case 251:
+  case 249:
 /* Line 1813 of yacc.c  */
-#line 1503 "conf_parser.y"
+#line 1495 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4686,9 +4671,9 @@ yyreduce:
 }
     break;
 
-  case 252:
+  case 250:
 /* Line 1813 of yacc.c  */
-#line 1515 "conf_parser.y"
+#line 1507 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4702,9 +4687,9 @@ yyreduce:
 }
     break;
 
-  case 253:
+  case 251:
 /* Line 1813 of yacc.c  */
-#line 1526 "conf_parser.y"
+#line 1518 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4757,9 +4742,9 @@ yyreduce:
 }
     break;
 
-  case 265:
+  case 263:
 /* Line 1813 of yacc.c  */
-#line 1583 "conf_parser.y"
+#line 1575 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4795,9 +4780,9 @@ yyreduce:
 }
     break;
 
-  case 266:
+  case 264:
 /* Line 1813 of yacc.c  */
-#line 1618 "conf_parser.y"
+#line 1610 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4811,9 +4796,9 @@ yyreduce:
 }
     break;
 
-  case 267:
+  case 265:
 /* Line 1813 of yacc.c  */
-#line 1631 "conf_parser.y"
+#line 1623 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4823,9 +4808,9 @@ yyreduce:
 }
     break;
 
-  case 268:
+  case 266:
 /* Line 1813 of yacc.c  */
-#line 1640 "conf_parser.y"
+#line 1632 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4837,97 +4822,97 @@ yyreduce:
 }
     break;
 
-  case 269:
+  case 267:
 /* Line 1813 of yacc.c  */
-#line 1651 "conf_parser.y"
+#line 1643 "conf_parser.y"
     {
 }
     break;
 
-  case 273:
+  case 271:
 /* Line 1813 of yacc.c  */
-#line 1656 "conf_parser.y"
+#line 1648 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_SPOOF_NOTICE;
 }
     break;
 
-  case 274:
+  case 272:
 /* Line 1813 of yacc.c  */
-#line 1660 "conf_parser.y"
+#line 1652 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_NOLIMIT;
 }
     break;
 
-  case 275:
+  case 273:
 /* Line 1813 of yacc.c  */
-#line 1664 "conf_parser.y"
+#line 1656 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_EXEMPTKLINE;
 }
     break;
 
-  case 276:
+  case 274:
 /* Line 1813 of yacc.c  */
-#line 1668 "conf_parser.y"
+#line 1660 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_NEED_IDENTD;
 }
     break;
 
-  case 277:
+  case 275:
 /* Line 1813 of yacc.c  */
-#line 1672 "conf_parser.y"
+#line 1664 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_CAN_FLOOD;
 }
     break;
 
-  case 278:
+  case 276:
 /* Line 1813 of yacc.c  */
-#line 1676 "conf_parser.y"
+#line 1668 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_NO_TILDE;
 }
     break;
 
-  case 279:
+  case 277:
 /* Line 1813 of yacc.c  */
-#line 1680 "conf_parser.y"
+#line 1672 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_EXEMPTGLINE;
 }
     break;
 
-  case 280:
+  case 278:
 /* Line 1813 of yacc.c  */
-#line 1684 "conf_parser.y"
+#line 1676 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_EXEMPTRESV;
 }
     break;
 
-  case 281:
+  case 279:
 /* Line 1813 of yacc.c  */
-#line 1688 "conf_parser.y"
+#line 1680 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= CONF_FLAGS_NEED_PASSWORD;
 }
     break;
 
-  case 282:
+  case 280:
 /* Line 1813 of yacc.c  */
-#line 1694 "conf_parser.y"
+#line 1686 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4947,9 +4932,9 @@ yyreduce:
 }
     break;
 
-  case 283:
+  case 281:
 /* Line 1813 of yacc.c  */
-#line 1713 "conf_parser.y"
+#line 1705 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4960,9 +4945,9 @@ yyreduce:
 }
     break;
 
-  case 284:
+  case 282:
 /* Line 1813 of yacc.c  */
-#line 1723 "conf_parser.y"
+#line 1715 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4972,9 +4957,9 @@ yyreduce:
 }
     break;
 
-  case 285:
+  case 283:
 /* Line 1813 of yacc.c  */
-#line 1736 "conf_parser.y"
+#line 1728 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4984,9 +4969,9 @@ yyreduce:
 }
     break;
 
-  case 286:
+  case 284:
 /* Line 1813 of yacc.c  */
-#line 1743 "conf_parser.y"
+#line 1735 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -4996,9 +4981,9 @@ yyreduce:
 }
     break;
 
-  case 293:
+  case 291:
 /* Line 1813 of yacc.c  */
-#line 1755 "conf_parser.y"
+#line 1747 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5008,9 +4993,9 @@ yyreduce:
 }
     break;
 
-  case 294:
+  case 292:
 /* Line 1813 of yacc.c  */
-#line 1764 "conf_parser.y"
+#line 1756 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5026,9 +5011,9 @@ yyreduce:
 }
     break;
 
-  case 295:
+  case 293:
 /* Line 1813 of yacc.c  */
-#line 1779 "conf_parser.y"
+#line 1771 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5039,9 +5024,9 @@ yyreduce:
 }
     break;
 
-  case 301:
+  case 299:
 /* Line 1813 of yacc.c  */
-#line 1797 "conf_parser.y"
+#line 1789 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5054,21 +5039,21 @@ yyreduce:
 }
     break;
 
-  case 302:
+  case 300:
 /* Line 1813 of yacc.c  */
-#line 1812 "conf_parser.y"
+#line 1804 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
     yy_conf = conf_make(CONF_ULINE);
-    yy_conf->action = SHARED_ALL;
+    yy_conf->flags = SHARED_ALL;
   }
 }
     break;
 
-  case 303:
+  case 301:
 /* Line 1813 of yacc.c  */
-#line 1819 "conf_parser.y"
+#line 1811 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5077,9 +5062,9 @@ yyreduce:
 }
     break;
 
-  case 310:
+  case 308:
 /* Line 1813 of yacc.c  */
-#line 1830 "conf_parser.y"
+#line 1822 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5089,9 +5074,9 @@ yyreduce:
 }
     break;
 
-  case 311:
+  case 309:
 /* Line 1813 of yacc.c  */
-#line 1839 "conf_parser.y"
+#line 1831 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5114,12 +5099,30 @@ yyreduce:
 }
     break;
 
-  case 312:
+  case 310:
+/* Line 1813 of yacc.c  */
+#line 1853 "conf_parser.y"
+    {
+  if (conf_parser_ctx.pass == 2)
+    yy_conf->flags = 0;
+}
+    break;
+
+  case 314:
+/* Line 1813 of yacc.c  */
+#line 1860 "conf_parser.y"
+    {
+  if (conf_parser_ctx.pass == 2)
+    yy_conf->flags |= SHARED_KLINE;
+}
+    break;
+
+  case 315:
 /* Line 1813 of yacc.c  */
-#line 1861 "conf_parser.y"
+#line 1864 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action = 0;
+    yy_conf->flags |= SHARED_UNKLINE;
 }
     break;
 
@@ -5128,7 +5131,7 @@ yyreduce:
 #line 1868 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_KLINE;
+    yy_conf->flags |= SHARED_DLINE;
 }
     break;
 
@@ -5137,7 +5140,7 @@ yyreduce:
 #line 1872 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNKLINE;
+    yy_conf->flags |= SHARED_UNDLINE;
 }
     break;
 
@@ -5146,7 +5149,7 @@ yyreduce:
 #line 1876 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_DLINE;
+    yy_conf->flags |= SHARED_XLINE;
 }
     break;
 
@@ -5155,7 +5158,7 @@ yyreduce:
 #line 1880 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNDLINE;
+    yy_conf->flags |= SHARED_UNXLINE;
 }
     break;
 
@@ -5164,7 +5167,7 @@ yyreduce:
 #line 1884 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_XLINE;
+    yy_conf->flags |= SHARED_RESV;
 }
     break;
 
@@ -5173,7 +5176,7 @@ yyreduce:
 #line 1888 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNXLINE;
+    yy_conf->flags |= SHARED_UNRESV;
 }
     break;
 
@@ -5182,7 +5185,7 @@ yyreduce:
 #line 1892 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_RESV;
+    yy_conf->flags |= SHARED_LOCOPS;
 }
     break;
 
@@ -5191,31 +5194,13 @@ yyreduce:
 #line 1896 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNRESV;
+    yy_conf->flags = SHARED_ALL;
 }
     break;
 
   case 324:
 /* Line 1813 of yacc.c  */
-#line 1900 "conf_parser.y"
-    {
-  if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_LOCOPS;
-}
-    break;
-
-  case 325:
-/* Line 1813 of yacc.c  */
-#line 1904 "conf_parser.y"
-    {
-  if (conf_parser_ctx.pass == 2)
-    yy_conf->action = SHARED_ALL;
-}
-    break;
-
-  case 326:
-/* Line 1813 of yacc.c  */
-#line 1913 "conf_parser.y"
+#line 1905 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5224,9 +5209,9 @@ yyreduce:
 }
     break;
 
-  case 327:
+  case 325:
 /* Line 1813 of yacc.c  */
-#line 1919 "conf_parser.y"
+#line 1911 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5237,117 +5222,117 @@ yyreduce:
 }
     break;
 
-  case 333:
+  case 331:
 /* Line 1813 of yacc.c  */
-#line 1932 "conf_parser.y"
+#line 1924 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     DupString(yy_conf->name, yylval.string);
 }
     break;
 
-  case 334:
+  case 332:
 /* Line 1813 of yacc.c  */
-#line 1938 "conf_parser.y"
+#line 1930 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags = 0;
 }
     break;
 
-  case 338:
+  case 336:
 /* Line 1813 of yacc.c  */
-#line 1945 "conf_parser.y"
+#line 1937 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_KLINE;
 }
     break;
 
-  case 339:
+  case 337:
 /* Line 1813 of yacc.c  */
-#line 1949 "conf_parser.y"
+#line 1941 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_UNKLINE;
 }
     break;
 
-  case 340:
+  case 338:
 /* Line 1813 of yacc.c  */
-#line 1953 "conf_parser.y"
+#line 1945 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_DLINE;
 }
     break;
 
-  case 341:
+  case 339:
 /* Line 1813 of yacc.c  */
-#line 1957 "conf_parser.y"
+#line 1949 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_UNDLINE;
 }
     break;
 
-  case 342:
+  case 340:
 /* Line 1813 of yacc.c  */
-#line 1961 "conf_parser.y"
+#line 1953 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_XLINE;
 }
     break;
 
-  case 343:
+  case 341:
 /* Line 1813 of yacc.c  */
-#line 1965 "conf_parser.y"
+#line 1957 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_UNXLINE;
 }
     break;
 
-  case 344:
+  case 342:
 /* Line 1813 of yacc.c  */
-#line 1969 "conf_parser.y"
+#line 1961 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_RESV;
 }
     break;
 
-  case 345:
+  case 343:
 /* Line 1813 of yacc.c  */
-#line 1973 "conf_parser.y"
+#line 1965 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_UNRESV;
 }
     break;
 
-  case 346:
+  case 344:
 /* Line 1813 of yacc.c  */
-#line 1977 "conf_parser.y"
+#line 1969 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags |= SHARED_LOCOPS;
 }
     break;
 
-  case 347:
+  case 345:
 /* Line 1813 of yacc.c  */
-#line 1981 "conf_parser.y"
+#line 1973 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->flags = SHARED_ALL;
 }
     break;
 
-  case 348:
+  case 346:
 /* Line 1813 of yacc.c  */
-#line 1990 "conf_parser.y"
+#line 1982 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5364,9 +5349,9 @@ yyreduce:
 }
     break;
 
-  case 349:
+  case 347:
 /* Line 1813 of yacc.c  */
-#line 2004 "conf_parser.y"
+#line 1996 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5402,9 +5387,9 @@ yyreduce:
 }
     break;
 
-  case 366:
+  case 364:
 /* Line 1813 of yacc.c  */
-#line 2047 "conf_parser.y"
+#line 2039 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5414,9 +5399,9 @@ yyreduce:
 }
     break;
 
-  case 367:
+  case 365:
 /* Line 1813 of yacc.c  */
-#line 2056 "conf_parser.y"
+#line 2048 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5426,9 +5411,9 @@ yyreduce:
 }
     break;
 
-  case 368:
+  case 366:
 /* Line 1813 of yacc.c  */
-#line 2065 "conf_parser.y"
+#line 2057 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5455,9 +5440,9 @@ yyreduce:
 }
     break;
 
-  case 369:
+  case 367:
 /* Line 1813 of yacc.c  */
-#line 2091 "conf_parser.y"
+#line 2083 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5476,9 +5461,9 @@ yyreduce:
 }
     break;
 
-  case 370:
+  case 368:
 /* Line 1813 of yacc.c  */
-#line 2109 "conf_parser.y"
+#line 2101 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5497,27 +5482,27 @@ yyreduce:
 }
     break;
 
-  case 371:
+  case 369:
 /* Line 1813 of yacc.c  */
-#line 2127 "conf_parser.y"
+#line 2119 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->port = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 372:
+  case 370:
 /* Line 1813 of yacc.c  */
-#line 2133 "conf_parser.y"
+#line 2125 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     yy_conf->aftype = AF_INET;
 }
     break;
 
-  case 373:
+  case 371:
 /* Line 1813 of yacc.c  */
-#line 2137 "conf_parser.y"
+#line 2129 "conf_parser.y"
     {
 #ifdef IPV6
   if (conf_parser_ctx.pass == 2)
@@ -5526,34 +5511,34 @@ yyreduce:
 }
     break;
 
-  case 374:
+  case 372:
 /* Line 1813 of yacc.c  */
-#line 2145 "conf_parser.y"
+#line 2137 "conf_parser.y"
     {
 }
     break;
 
-  case 378:
+  case 376:
 /* Line 1813 of yacc.c  */
-#line 2150 "conf_parser.y"
+#line 2142 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     SetConfAllowAutoConn(yy_conf);
 }
     break;
 
-  case 379:
+  case 377:
 /* Line 1813 of yacc.c  */
-#line 2154 "conf_parser.y"
+#line 2146 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     SetConfSSL(yy_conf);
 }
     break;
 
-  case 380:
+  case 378:
 /* Line 1813 of yacc.c  */
-#line 2160 "conf_parser.y"
+#line 2152 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5565,9 +5550,9 @@ yyreduce:
 }
     break;
 
-  case 381:
+  case 379:
 /* Line 1813 of yacc.c  */
-#line 2171 "conf_parser.y"
+#line 2163 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5579,9 +5564,9 @@ yyreduce:
 }
     break;
 
-  case 382:
+  case 380:
 /* Line 1813 of yacc.c  */
-#line 2182 "conf_parser.y"
+#line 2174 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5593,9 +5578,9 @@ yyreduce:
 }
     break;
 
-  case 383:
+  case 381:
 /* Line 1813 of yacc.c  */
-#line 2193 "conf_parser.y"
+#line 2185 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5605,9 +5590,9 @@ yyreduce:
 }
     break;
 
-  case 384:
+  case 382:
 /* Line 1813 of yacc.c  */
-#line 2202 "conf_parser.y"
+#line 2194 "conf_parser.y"
     {
 #ifdef HAVE_LIBCRYPTO
   if (conf_parser_ctx.pass == 2)
@@ -5622,9 +5607,9 @@ yyreduce:
 }
     break;
 
-  case 385:
+  case 383:
 /* Line 1813 of yacc.c  */
-#line 2220 "conf_parser.y"
+#line 2212 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5634,9 +5619,9 @@ yyreduce:
 }
     break;
 
-  case 386:
+  case 384:
 /* Line 1813 of yacc.c  */
-#line 2227 "conf_parser.y"
+#line 2219 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5693,25 +5678,25 @@ yyreduce:
 }
     break;
 
-  case 387:
+  case 385:
 /* Line 1813 of yacc.c  */
-#line 2283 "conf_parser.y"
+#line 2275 "conf_parser.y"
     {
 }
     break;
 
-  case 391:
+  case 389:
 /* Line 1813 of yacc.c  */
-#line 2288 "conf_parser.y"
+#line 2280 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     regex_ban = 1;
 }
     break;
 
-  case 398:
+  case 396:
 /* Line 1813 of yacc.c  */
-#line 2297 "conf_parser.y"
+#line 2289 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5731,27 +5716,27 @@ yyreduce:
 }
     break;
 
-  case 399:
+  case 397:
 /* Line 1813 of yacc.c  */
-#line 2316 "conf_parser.y"
+#line 2308 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
 }
     break;
 
-  case 400:
+  case 398:
 /* Line 1813 of yacc.c  */
-#line 2325 "conf_parser.y"
+#line 2317 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     hostbuf[0] = reasonbuf[0] = '\0';
 }
     break;
 
-  case 401:
+  case 399:
 /* Line 1813 of yacc.c  */
-#line 2329 "conf_parser.y"
+#line 2321 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5771,27 +5756,27 @@ yyreduce:
 }
     break;
 
-  case 407:
+  case 405:
 /* Line 1813 of yacc.c  */
-#line 2351 "conf_parser.y"
+#line 2343 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
 }
     break;
 
-  case 408:
+  case 406:
 /* Line 1813 of yacc.c  */
-#line 2357 "conf_parser.y"
+#line 2349 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
 }
     break;
 
-  case 414:
+  case 412:
 /* Line 1813 of yacc.c  */
-#line 2371 "conf_parser.y"
+#line 2363 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5807,9 +5792,9 @@ yyreduce:
 }
     break;
 
-  case 415:
+  case 413:
 /* Line 1813 of yacc.c  */
-#line 2389 "conf_parser.y"
+#line 2381 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5819,9 +5804,9 @@ yyreduce:
 }
     break;
 
-  case 416:
+  case 414:
 /* Line 1813 of yacc.c  */
-#line 2396 "conf_parser.y"
+#line 2388 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5861,199 +5846,199 @@ yyreduce:
 }
     break;
 
-  case 417:
+  case 415:
 /* Line 1813 of yacc.c  */
-#line 2435 "conf_parser.y"
+#line 2427 "conf_parser.y"
     {
 }
     break;
 
-  case 421:
+  case 419:
 /* Line 1813 of yacc.c  */
-#line 2440 "conf_parser.y"
+#line 2432 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     regex_ban = 1;
 }
     break;
 
-  case 428:
+  case 426:
 /* Line 1813 of yacc.c  */
-#line 2449 "conf_parser.y"
+#line 2441 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
 }
     break;
 
-  case 429:
+  case 427:
 /* Line 1813 of yacc.c  */
-#line 2455 "conf_parser.y"
+#line 2447 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
 }
     break;
 
-  case 483:
+  case 481:
 /* Line 1813 of yacc.c  */
-#line 2500 "conf_parser.y"
+#line 2492 "conf_parser.y"
     {
   ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 484:
+  case 482:
 /* Line 1813 of yacc.c  */
-#line 2505 "conf_parser.y"
+#line 2497 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.glines = yylval.number;
 }
     break;
 
-  case 485:
+  case 483:
 /* Line 1813 of yacc.c  */
-#line 2511 "conf_parser.y"
+#line 2503 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 486:
+  case 484:
 /* Line 1813 of yacc.c  */
-#line 2517 "conf_parser.y"
+#line 2509 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 487:
+  case 485:
 /* Line 1813 of yacc.c  */
-#line 2523 "conf_parser.y"
+#line 2515 "conf_parser.y"
     {
   ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 488:
+  case 486:
 /* Line 1813 of yacc.c  */
-#line 2528 "conf_parser.y"
+#line 2520 "conf_parser.y"
     {
   ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 489:
+  case 487:
 /* Line 1813 of yacc.c  */
-#line 2533 "conf_parser.y"
+#line 2525 "conf_parser.y"
     {
   ConfigFileEntry.tkline_expire_notices = yylval.number;
 }
     break;
 
-  case 490:
+  case 488:
 /* Line 1813 of yacc.c  */
-#line 2538 "conf_parser.y"
+#line 2530 "conf_parser.y"
     {
   ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 491:
+  case 489:
 /* Line 1813 of yacc.c  */
-#line 2543 "conf_parser.y"
+#line 2535 "conf_parser.y"
     {
   ConfigFileEntry.hide_spoof_ips = yylval.number;
 }
     break;
 
-  case 492:
+  case 490:
 /* Line 1813 of yacc.c  */
-#line 2548 "conf_parser.y"
+#line 2540 "conf_parser.y"
     {
   ConfigFileEntry.ignore_bogus_ts = yylval.number;
 }
     break;
 
-  case 493:
+  case 491:
 /* Line 1813 of yacc.c  */
-#line 2553 "conf_parser.y"
+#line 2545 "conf_parser.y"
     {
   ConfigFileEntry.disable_remote = yylval.number;
 }
     break;
 
-  case 494:
+  case 492:
 /* Line 1813 of yacc.c  */
-#line 2558 "conf_parser.y"
+#line 2550 "conf_parser.y"
     {
   ConfigFileEntry.failed_oper_notice = yylval.number;
 }
     break;
 
-  case 495:
+  case 493:
 /* Line 1813 of yacc.c  */
-#line 2563 "conf_parser.y"
+#line 2555 "conf_parser.y"
     {
   ConfigFileEntry.anti_nick_flood = yylval.number;
 }
     break;
 
-  case 496:
+  case 494:
 /* Line 1813 of yacc.c  */
-#line 2568 "conf_parser.y"
+#line 2560 "conf_parser.y"
     {
   ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); 
 }
     break;
 
-  case 497:
+  case 495:
 /* Line 1813 of yacc.c  */
-#line 2573 "conf_parser.y"
+#line 2565 "conf_parser.y"
     {
   ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 498:
+  case 496:
 /* Line 1813 of yacc.c  */
-#line 2578 "conf_parser.y"
+#line 2570 "conf_parser.y"
     {
   ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 499:
+  case 497:
 /* Line 1813 of yacc.c  */
-#line 2583 "conf_parser.y"
+#line 2575 "conf_parser.y"
     {
   ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 500:
+  case 498:
 /* Line 1813 of yacc.c  */
-#line 2588 "conf_parser.y"
+#line 2580 "conf_parser.y"
     {
   ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 501:
+  case 499:
 /* Line 1813 of yacc.c  */
-#line 2593 "conf_parser.y"
+#line 2585 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 502:
+  case 500:
 /* Line 1813 of yacc.c  */
-#line 2599 "conf_parser.y"
+#line 2591 "conf_parser.y"
     {
   if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
   {
@@ -6065,145 +6050,145 @@ yyreduce:
 }
     break;
 
-  case 503:
+  case 501:
 /* Line 1813 of yacc.c  */
-#line 2610 "conf_parser.y"
+#line 2602 "conf_parser.y"
     {
   ConfigFileEntry.invisible_on_connect = yylval.number;
 }
     break;
 
-  case 504:
+  case 502:
 /* Line 1813 of yacc.c  */
-#line 2615 "conf_parser.y"
+#line 2607 "conf_parser.y"
     {
   ConfigFileEntry.warn_no_nline = yylval.number;
 }
     break;
 
-  case 505:
+  case 503:
 /* Line 1813 of yacc.c  */
-#line 2620 "conf_parser.y"
+#line 2612 "conf_parser.y"
     {
   ConfigFileEntry.stats_e_disabled = yylval.number;
 }
     break;
 
-  case 506:
+  case 504:
 /* Line 1813 of yacc.c  */
-#line 2625 "conf_parser.y"
+#line 2617 "conf_parser.y"
     {
   ConfigFileEntry.stats_o_oper_only = yylval.number;
 }
     break;
 
-  case 507:
+  case 505:
 /* Line 1813 of yacc.c  */
-#line 2630 "conf_parser.y"
+#line 2622 "conf_parser.y"
     {
   ConfigFileEntry.stats_P_oper_only = yylval.number;
 }
     break;
 
-  case 508:
+  case 506:
 /* Line 1813 of yacc.c  */
-#line 2635 "conf_parser.y"
+#line 2627 "conf_parser.y"
     {
   ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
 }
     break;
 
-  case 509:
+  case 507:
 /* Line 1813 of yacc.c  */
-#line 2638 "conf_parser.y"
+#line 2630 "conf_parser.y"
     {
   ConfigFileEntry.stats_k_oper_only = 1;
 }
     break;
 
-  case 510:
+  case 508:
 /* Line 1813 of yacc.c  */
-#line 2643 "conf_parser.y"
+#line 2635 "conf_parser.y"
     {
   ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
 }
     break;
 
-  case 511:
+  case 509:
 /* Line 1813 of yacc.c  */
-#line 2646 "conf_parser.y"
+#line 2638 "conf_parser.y"
     {
   ConfigFileEntry.stats_i_oper_only = 1;
 }
     break;
 
-  case 512:
+  case 510:
 /* Line 1813 of yacc.c  */
-#line 2651 "conf_parser.y"
+#line 2643 "conf_parser.y"
     {
   ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 513:
+  case 511:
 /* Line 1813 of yacc.c  */
-#line 2656 "conf_parser.y"
+#line 2648 "conf_parser.y"
     {
   ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 514:
+  case 512:
 /* Line 1813 of yacc.c  */
-#line 2661 "conf_parser.y"
+#line 2653 "conf_parser.y"
     {
   ConfigFileEntry.opers_bypass_callerid = yylval.number;
 }
     break;
 
-  case 515:
+  case 513:
 /* Line 1813 of yacc.c  */
-#line 2666 "conf_parser.y"
+#line 2658 "conf_parser.y"
     {
   ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 516:
+  case 514:
 /* Line 1813 of yacc.c  */
-#line 2671 "conf_parser.y"
+#line 2663 "conf_parser.y"
     {
   ConfigFileEntry.short_motd = yylval.number;
 }
     break;
 
-  case 517:
+  case 515:
 /* Line 1813 of yacc.c  */
-#line 2676 "conf_parser.y"
+#line 2668 "conf_parser.y"
     {
   ConfigFileEntry.no_oper_flood = yylval.number;
 }
     break;
 
-  case 518:
+  case 516:
 /* Line 1813 of yacc.c  */
-#line 2681 "conf_parser.y"
+#line 2673 "conf_parser.y"
     {
   ConfigFileEntry.true_no_oper_flood = yylval.number;
 }
     break;
 
-  case 519:
+  case 517:
 /* Line 1813 of yacc.c  */
-#line 2686 "conf_parser.y"
+#line 2678 "conf_parser.y"
     {
   ConfigFileEntry.oper_pass_resv = yylval.number;
 }
     break;
 
-  case 520:
+  case 518:
 /* Line 1813 of yacc.c  */
-#line 2691 "conf_parser.y"
+#line 2683 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6215,33 +6200,33 @@ yyreduce:
 }
     break;
 
-  case 521:
+  case 519:
 /* Line 1813 of yacc.c  */
-#line 2702 "conf_parser.y"
+#line 2694 "conf_parser.y"
     {
   ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 522:
+  case 520:
 /* Line 1813 of yacc.c  */
-#line 2707 "conf_parser.y"
+#line 2699 "conf_parser.y"
     {
   ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 523:
+  case 521:
 /* Line 1813 of yacc.c  */
-#line 2712 "conf_parser.y"
+#line 2704 "conf_parser.y"
     {
   ConfigFileEntry.use_egd = yylval.number;
 }
     break;
 
-  case 524:
+  case 522:
 /* Line 1813 of yacc.c  */
-#line 2717 "conf_parser.y"
+#line 2709 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6251,9 +6236,9 @@ yyreduce:
 }
     break;
 
-  case 525:
+  case 523:
 /* Line 1813 of yacc.c  */
-#line 2726 "conf_parser.y"
+#line 2718 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
   {
@@ -6263,523 +6248,523 @@ yyreduce:
 }
     break;
 
-  case 526:
+  case 524:
 /* Line 1813 of yacc.c  */
-#line 2735 "conf_parser.y"
+#line 2727 "conf_parser.y"
     {
   ConfigFileEntry.ping_cookie = yylval.number;
 }
     break;
 
-  case 527:
+  case 525:
 /* Line 1813 of yacc.c  */
-#line 2740 "conf_parser.y"
+#line 2732 "conf_parser.y"
     {
   ConfigFileEntry.disable_auth = yylval.number;
 }
     break;
 
-  case 528:
+  case 526:
 /* Line 1813 of yacc.c  */
-#line 2745 "conf_parser.y"
+#line 2737 "conf_parser.y"
     {
   ConfigFileEntry.throttle_time = yylval.number;
 }
     break;
 
-  case 529:
+  case 527:
 /* Line 1813 of yacc.c  */
-#line 2750 "conf_parser.y"
+#line 2742 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes = 0;
 }
     break;
 
-  case 533:
+  case 531:
 /* Line 1813 of yacc.c  */
-#line 2756 "conf_parser.y"
+#line 2748 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_BOTS;
 }
     break;
 
-  case 534:
+  case 532:
 /* Line 1813 of yacc.c  */
-#line 2759 "conf_parser.y"
+#line 2751 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN;
 }
     break;
 
-  case 535:
+  case 533:
 /* Line 1813 of yacc.c  */
-#line 2762 "conf_parser.y"
+#line 2754 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
 }
     break;
 
-  case 536:
+  case 534:
 /* Line 1813 of yacc.c  */
-#line 2765 "conf_parser.y"
+#line 2757 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_DEAF;
 }
     break;
 
-  case 537:
+  case 535:
 /* Line 1813 of yacc.c  */
-#line 2768 "conf_parser.y"
+#line 2760 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
 }
     break;
 
-  case 538:
+  case 536:
 /* Line 1813 of yacc.c  */
-#line 2771 "conf_parser.y"
+#line 2763 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_FULL;
 }
     break;
 
-  case 539:
+  case 537:
 /* Line 1813 of yacc.c  */
-#line 2774 "conf_parser.y"
+#line 2766 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
 }
     break;
 
-  case 540:
+  case 538:
 /* Line 1813 of yacc.c  */
-#line 2777 "conf_parser.y"
+#line 2769 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SKILL;
 }
     break;
 
-  case 541:
+  case 539:
 /* Line 1813 of yacc.c  */
-#line 2780 "conf_parser.y"
+#line 2772 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
 }
     break;
 
-  case 542:
+  case 540:
 /* Line 1813 of yacc.c  */
-#line 2783 "conf_parser.y"
+#line 2775 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_REJ;
 }
     break;
 
-  case 543:
+  case 541:
 /* Line 1813 of yacc.c  */
-#line 2786 "conf_parser.y"
+#line 2778 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
 }
     break;
 
-  case 544:
+  case 542:
 /* Line 1813 of yacc.c  */
-#line 2789 "conf_parser.y"
+#line 2781 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SPY;
 }
     break;
 
-  case 545:
+  case 543:
 /* Line 1813 of yacc.c  */
-#line 2792 "conf_parser.y"
+#line 2784 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
 }
     break;
 
-  case 546:
+  case 544:
 /* Line 1813 of yacc.c  */
-#line 2795 "conf_parser.y"
+#line 2787 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
 }
     break;
 
-  case 547:
+  case 545:
 /* Line 1813 of yacc.c  */
-#line 2798 "conf_parser.y"
+#line 2790 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
 }
     break;
 
-  case 548:
+  case 546:
 /* Line 1813 of yacc.c  */
-#line 2801 "conf_parser.y"
+#line 2793 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
 }
     break;
 
-  case 549:
+  case 547:
 /* Line 1813 of yacc.c  */
-#line 2804 "conf_parser.y"
+#line 2796 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
 }
     break;
 
-  case 550:
+  case 548:
 /* Line 1813 of yacc.c  */
-#line 2807 "conf_parser.y"
+#line 2799 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
 }
     break;
 
-  case 551:
+  case 549:
 /* Line 1813 of yacc.c  */
-#line 2810 "conf_parser.y"
+#line 2802 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
 }
     break;
 
-  case 552:
+  case 550:
 /* Line 1813 of yacc.c  */
-#line 2813 "conf_parser.y"
+#line 2805 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
 }
     break;
 
-  case 553:
+  case 551:
 /* Line 1813 of yacc.c  */
-#line 2818 "conf_parser.y"
+#line 2810 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes = 0;
 }
     break;
 
-  case 557:
+  case 555:
 /* Line 1813 of yacc.c  */
-#line 2824 "conf_parser.y"
+#line 2816 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
 }
     break;
 
-  case 558:
+  case 556:
 /* Line 1813 of yacc.c  */
-#line 2827 "conf_parser.y"
+#line 2819 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
 }
     break;
 
-  case 559:
+  case 557:
 /* Line 1813 of yacc.c  */
-#line 2830 "conf_parser.y"
+#line 2822 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
 }
     break;
 
-  case 560:
+  case 558:
 /* Line 1813 of yacc.c  */
-#line 2833 "conf_parser.y"
+#line 2825 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
 }
     break;
 
-  case 561:
+  case 559:
 /* Line 1813 of yacc.c  */
-#line 2836 "conf_parser.y"
+#line 2828 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
 }
     break;
 
-  case 562:
+  case 560:
 /* Line 1813 of yacc.c  */
-#line 2839 "conf_parser.y"
+#line 2831 "conf_parser.y"
     { 
   ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
 }
     break;
 
-  case 563:
+  case 561:
 /* Line 1813 of yacc.c  */
-#line 2842 "conf_parser.y"
+#line 2834 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
 }
     break;
 
-  case 564:
+  case 562:
 /* Line 1813 of yacc.c  */
-#line 2845 "conf_parser.y"
+#line 2837 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
 }
     break;
 
-  case 565:
+  case 563:
 /* Line 1813 of yacc.c  */
-#line 2848 "conf_parser.y"
+#line 2840 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
 }
     break;
 
-  case 566:
+  case 564:
 /* Line 1813 of yacc.c  */
-#line 2851 "conf_parser.y"
+#line 2843 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
 }
     break;
 
-  case 567:
+  case 565:
 /* Line 1813 of yacc.c  */
-#line 2854 "conf_parser.y"
+#line 2846 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
 }
     break;
 
-  case 568:
+  case 566:
 /* Line 1813 of yacc.c  */
-#line 2857 "conf_parser.y"
+#line 2849 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
 }
     break;
 
-  case 569:
+  case 567:
 /* Line 1813 of yacc.c  */
-#line 2860 "conf_parser.y"
+#line 2852 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
 }
     break;
 
-  case 570:
+  case 568:
 /* Line 1813 of yacc.c  */
-#line 2863 "conf_parser.y"
+#line 2855 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
 }
     break;
 
-  case 571:
+  case 569:
 /* Line 1813 of yacc.c  */
-#line 2866 "conf_parser.y"
+#line 2858 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
 }
     break;
 
-  case 572:
+  case 570:
 /* Line 1813 of yacc.c  */
-#line 2869 "conf_parser.y"
+#line 2861 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
 }
     break;
 
-  case 573:
+  case 571:
 /* Line 1813 of yacc.c  */
-#line 2872 "conf_parser.y"
+#line 2864 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
 }
     break;
 
-  case 574:
+  case 572:
 /* Line 1813 of yacc.c  */
-#line 2875 "conf_parser.y"
+#line 2867 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
 }
     break;
 
-  case 575:
+  case 573:
 /* Line 1813 of yacc.c  */
-#line 2878 "conf_parser.y"
+#line 2870 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
 }
     break;
 
-  case 576:
+  case 574:
 /* Line 1813 of yacc.c  */
-#line 2881 "conf_parser.y"
+#line 2873 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
 }
     break;
 
-  case 577:
+  case 575:
 /* Line 1813 of yacc.c  */
-#line 2886 "conf_parser.y"
+#line 2878 "conf_parser.y"
     {
   ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 578:
+  case 576:
 /* Line 1813 of yacc.c  */
-#line 2891 "conf_parser.y"
+#line 2883 "conf_parser.y"
     {
   ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 579:
+  case 577:
 /* Line 1813 of yacc.c  */
-#line 2896 "conf_parser.y"
+#line 2888 "conf_parser.y"
     {
   ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 598:
+  case 596:
 /* Line 1813 of yacc.c  */
-#line 2919 "conf_parser.y"
+#line 2911 "conf_parser.y"
     {
   ConfigChannel.disable_fake_channels = yylval.number;
 }
     break;
 
-  case 599:
+  case 597:
 /* Line 1813 of yacc.c  */
-#line 2924 "conf_parser.y"
+#line 2916 "conf_parser.y"
     {
   ConfigChannel.restrict_channels = yylval.number;
 }
     break;
 
-  case 600:
+  case 598:
 /* Line 1813 of yacc.c  */
-#line 2929 "conf_parser.y"
+#line 2921 "conf_parser.y"
     {
   ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 601:
+  case 599:
 /* Line 1813 of yacc.c  */
-#line 2934 "conf_parser.y"
+#line 2926 "conf_parser.y"
     {
   ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 602:
+  case 600:
 /* Line 1813 of yacc.c  */
-#line 2939 "conf_parser.y"
+#line 2931 "conf_parser.y"
     {
   ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 603:
+  case 601:
 /* Line 1813 of yacc.c  */
-#line 2944 "conf_parser.y"
+#line 2936 "conf_parser.y"
     {
   ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 604:
+  case 602:
 /* Line 1813 of yacc.c  */
-#line 2949 "conf_parser.y"
+#line 2941 "conf_parser.y"
     {
   ConfigChannel.quiet_on_ban = yylval.number;
 }
     break;
 
-  case 605:
+  case 603:
 /* Line 1813 of yacc.c  */
-#line 2954 "conf_parser.y"
+#line 2946 "conf_parser.y"
     {
   ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 606:
+  case 604:
 /* Line 1813 of yacc.c  */
-#line 2959 "conf_parser.y"
+#line 2951 "conf_parser.y"
     {
   ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 607:
+  case 605:
 /* Line 1813 of yacc.c  */
-#line 2964 "conf_parser.y"
+#line 2956 "conf_parser.y"
     {
   ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
 }
     break;
 
-  case 608:
+  case 606:
 /* Line 1813 of yacc.c  */
-#line 2969 "conf_parser.y"
+#line 2961 "conf_parser.y"
     {
   ConfigChannel.no_create_on_split = yylval.number;
 }
     break;
 
-  case 609:
+  case 607:
 /* Line 1813 of yacc.c  */
-#line 2974 "conf_parser.y"
+#line 2966 "conf_parser.y"
     {
   ConfigChannel.no_join_on_split = yylval.number;
 }
     break;
 
-  case 610:
+  case 608:
 /* Line 1813 of yacc.c  */
-#line 2979 "conf_parser.y"
+#line 2971 "conf_parser.y"
     {
   GlobalSetOptions.joinfloodcount = yylval.number;
 }
     break;
 
-  case 611:
+  case 609:
 /* Line 1813 of yacc.c  */
-#line 2984 "conf_parser.y"
+#line 2976 "conf_parser.y"
     {
   GlobalSetOptions.joinfloodtime = yylval.number;
 }
     break;
 
-  case 622:
+  case 620:
 /* Line 1813 of yacc.c  */
-#line 3002 "conf_parser.y"
+#line 2994 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.flatten_links = yylval.number;
 }
     break;
 
-  case 623:
+  case 621:
 /* Line 1813 of yacc.c  */
-#line 3008 "conf_parser.y"
+#line 3000 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hide_servers = yylval.number;
 }
     break;
 
-  case 624:
+  case 622:
 /* Line 1813 of yacc.c  */
-#line 3014 "conf_parser.y"
+#line 3006 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6789,9 +6774,9 @@ yyreduce:
 }
     break;
 
-  case 625:
+  case 623:
 /* Line 1813 of yacc.c  */
-#line 3023 "conf_parser.y"
+#line 3015 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6806,18 +6791,18 @@ yyreduce:
 }
     break;
 
-  case 626:
+  case 624:
 /* Line 1813 of yacc.c  */
-#line 3037 "conf_parser.y"
+#line 3029 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hidden = yylval.number;
 }
     break;
 
-  case 627:
+  case 625:
 /* Line 1813 of yacc.c  */
-#line 3043 "conf_parser.y"
+#line 3035 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hide_server_ips = yylval.number;
@@ -6826,7 +6811,7 @@ yyreduce:
 
 
 /* Line 1813 of yacc.c  */
-#line 6830 "conf_parser.c"
+#line 6815 "conf_parser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/conf_parser.h b/src/conf_parser.h
index c627256..637fdf7 100644
--- a/src/conf_parser.h
+++ b/src/conf_parser.h
@@ -159,105 +159,104 @@ extern int yydebug;
      PATH = 368,
      PING_COOKIE = 369,
      PING_TIME = 370,
-     PING_WARNING = 371,
-     PORT = 372,
-     QSTRING = 373,
-     QUIET_ON_BAN = 374,
-     REASON = 375,
-     REDIRPORT = 376,
-     REDIRSERV = 377,
-     REGEX_T = 378,
-     REHASH = 379,
-     REMOTE = 380,
-     REMOTEBAN = 381,
-     RESTRICT_CHANNELS = 382,
-     RSA_PRIVATE_KEY_FILE = 383,
-     RSA_PUBLIC_KEY_FILE = 384,
-     SSL_CERTIFICATE_FILE = 385,
-     SSL_DH_PARAM_FILE = 386,
-     T_SSL_CLIENT_METHOD = 387,
-     T_SSL_SERVER_METHOD = 388,
-     T_SSLV3 = 389,
-     T_TLSV1 = 390,
-     RESV = 391,
-     RESV_EXEMPT = 392,
-     SECONDS = 393,
-     MINUTES = 394,
-     HOURS = 395,
-     DAYS = 396,
-     WEEKS = 397,
-     SENDQ = 398,
-     SEND_PASSWORD = 399,
-     SERVERHIDE = 400,
-     SERVERINFO = 401,
-     IRCD_SID = 402,
-     TKLINE_EXPIRE_NOTICES = 403,
-     T_SHARED = 404,
-     T_CLUSTER = 405,
-     TYPE = 406,
-     SHORT_MOTD = 407,
-     SPOOF = 408,
-     SPOOF_NOTICE = 409,
-     STATS_E_DISABLED = 410,
-     STATS_I_OPER_ONLY = 411,
-     STATS_K_OPER_ONLY = 412,
-     STATS_O_OPER_ONLY = 413,
-     STATS_P_OPER_ONLY = 414,
-     TBOOL = 415,
-     TMASKED = 416,
-     TS_MAX_DELTA = 417,
-     TS_WARN_DELTA = 418,
-     TWODOTS = 419,
-     T_ALL = 420,
-     T_BOTS = 421,
-     T_SOFTCALLERID = 422,
-     T_CALLERID = 423,
-     T_CCONN = 424,
-     T_CCONN_FULL = 425,
-     T_SSL_CIPHER_LIST = 426,
-     T_DEAF = 427,
-     T_DEBUG = 428,
-     T_DLINE = 429,
-     T_EXTERNAL = 430,
-     T_FULL = 431,
-     T_INVISIBLE = 432,
-     T_IPV4 = 433,
-     T_IPV6 = 434,
-     T_LOCOPS = 435,
-     T_MAX_CLIENTS = 436,
-     T_NCHANGE = 437,
-     T_OPERWALL = 438,
-     T_RECVQ = 439,
-     T_REJ = 440,
-     T_SERVER = 441,
-     T_SERVNOTICE = 442,
-     T_SET = 443,
-     T_SKILL = 444,
-     T_SPY = 445,
-     T_SSL = 446,
-     T_UMODES = 447,
-     T_UNAUTH = 448,
-     T_UNDLINE = 449,
-     T_UNLIMITED = 450,
-     T_UNRESV = 451,
-     T_UNXLINE = 452,
-     T_GLOBOPS = 453,
-     T_WALLOP = 454,
-     T_RESTART = 455,
-     T_SERVICE = 456,
-     T_SERVICES_NAME = 457,
-     THROTTLE_TIME = 458,
-     TRUE_NO_OPER_FLOOD = 459,
-     UNKLINE = 460,
-     USER = 461,
-     USE_EGD = 462,
-     USE_LOGGING = 463,
-     VHOST = 464,
-     VHOST6 = 465,
-     XLINE = 466,
-     WARN_NO_NLINE = 467,
-     T_SIZE = 468,
-     T_FILE = 469
+     PORT = 371,
+     QSTRING = 372,
+     QUIET_ON_BAN = 373,
+     REASON = 374,
+     REDIRPORT = 375,
+     REDIRSERV = 376,
+     REGEX_T = 377,
+     REHASH = 378,
+     REMOTE = 379,
+     REMOTEBAN = 380,
+     RESTRICT_CHANNELS = 381,
+     RSA_PRIVATE_KEY_FILE = 382,
+     RSA_PUBLIC_KEY_FILE = 383,
+     SSL_CERTIFICATE_FILE = 384,
+     SSL_DH_PARAM_FILE = 385,
+     T_SSL_CLIENT_METHOD = 386,
+     T_SSL_SERVER_METHOD = 387,
+     T_SSLV3 = 388,
+     T_TLSV1 = 389,
+     RESV = 390,
+     RESV_EXEMPT = 391,
+     SECONDS = 392,
+     MINUTES = 393,
+     HOURS = 394,
+     DAYS = 395,
+     WEEKS = 396,
+     SENDQ = 397,
+     SEND_PASSWORD = 398,
+     SERVERHIDE = 399,
+     SERVERINFO = 400,
+     IRCD_SID = 401,
+     TKLINE_EXPIRE_NOTICES = 402,
+     T_SHARED = 403,
+     T_CLUSTER = 404,
+     TYPE = 405,
+     SHORT_MOTD = 406,
+     SPOOF = 407,
+     SPOOF_NOTICE = 408,
+     STATS_E_DISABLED = 409,
+     STATS_I_OPER_ONLY = 410,
+     STATS_K_OPER_ONLY = 411,
+     STATS_O_OPER_ONLY = 412,
+     STATS_P_OPER_ONLY = 413,
+     TBOOL = 414,
+     TMASKED = 415,
+     TS_MAX_DELTA = 416,
+     TS_WARN_DELTA = 417,
+     TWODOTS = 418,
+     T_ALL = 419,
+     T_BOTS = 420,
+     T_SOFTCALLERID = 421,
+     T_CALLERID = 422,
+     T_CCONN = 423,
+     T_CCONN_FULL = 424,
+     T_SSL_CIPHER_LIST = 425,
+     T_DEAF = 426,
+     T_DEBUG = 427,
+     T_DLINE = 428,
+     T_EXTERNAL = 429,
+     T_FULL = 430,
+     T_INVISIBLE = 431,
+     T_IPV4 = 432,
+     T_IPV6 = 433,
+     T_LOCOPS = 434,
+     T_MAX_CLIENTS = 435,
+     T_NCHANGE = 436,
+     T_OPERWALL = 437,
+     T_RECVQ = 438,
+     T_REJ = 439,
+     T_SERVER = 440,
+     T_SERVNOTICE = 441,
+     T_SET = 442,
+     T_SKILL = 443,
+     T_SPY = 444,
+     T_SSL = 445,
+     T_UMODES = 446,
+     T_UNAUTH = 447,
+     T_UNDLINE = 448,
+     T_UNLIMITED = 449,
+     T_UNRESV = 450,
+     T_UNXLINE = 451,
+     T_GLOBOPS = 452,
+     T_WALLOP = 453,
+     T_RESTART = 454,
+     T_SERVICE = 455,
+     T_SERVICES_NAME = 456,
+     THROTTLE_TIME = 457,
+     TRUE_NO_OPER_FLOOD = 458,
+     UNKLINE = 459,
+     USER = 460,
+     USE_EGD = 461,
+     USE_LOGGING = 462,
+     VHOST = 463,
+     VHOST6 = 464,
+     XLINE = 465,
+     WARN_NO_NLINE = 466,
+     T_SIZE = 467,
+     T_FILE = 468
    };
 #endif
 /* Tokens.  */
@@ -374,105 +373,104 @@ extern int yydebug;
 #define PATH 368
 #define PING_COOKIE 369
 #define PING_TIME 370
-#define PING_WARNING 371
-#define PORT 372
-#define QSTRING 373
-#define QUIET_ON_BAN 374
-#define REASON 375
-#define REDIRPORT 376
-#define REDIRSERV 377
-#define REGEX_T 378
-#define REHASH 379
-#define REMOTE 380
-#define REMOTEBAN 381
-#define RESTRICT_CHANNELS 382
-#define RSA_PRIVATE_KEY_FILE 383
-#define RSA_PUBLIC_KEY_FILE 384
-#define SSL_CERTIFICATE_FILE 385
-#define SSL_DH_PARAM_FILE 386
-#define T_SSL_CLIENT_METHOD 387
-#define T_SSL_SERVER_METHOD 388
-#define T_SSLV3 389
-#define T_TLSV1 390
-#define RESV 391
-#define RESV_EXEMPT 392
-#define SECONDS 393
-#define MINUTES 394
-#define HOURS 395
-#define DAYS 396
-#define WEEKS 397
-#define SENDQ 398
-#define SEND_PASSWORD 399
-#define SERVERHIDE 400
-#define SERVERINFO 401
-#define IRCD_SID 402
-#define TKLINE_EXPIRE_NOTICES 403
-#define T_SHARED 404
-#define T_CLUSTER 405
-#define TYPE 406
-#define SHORT_MOTD 407
-#define SPOOF 408
-#define SPOOF_NOTICE 409
-#define STATS_E_DISABLED 410
-#define STATS_I_OPER_ONLY 411
-#define STATS_K_OPER_ONLY 412
-#define STATS_O_OPER_ONLY 413
-#define STATS_P_OPER_ONLY 414
-#define TBOOL 415
-#define TMASKED 416
-#define TS_MAX_DELTA 417
-#define TS_WARN_DELTA 418
-#define TWODOTS 419
-#define T_ALL 420
-#define T_BOTS 421
-#define T_SOFTCALLERID 422
-#define T_CALLERID 423
-#define T_CCONN 424
-#define T_CCONN_FULL 425
-#define T_SSL_CIPHER_LIST 426
-#define T_DEAF 427
-#define T_DEBUG 428
-#define T_DLINE 429
-#define T_EXTERNAL 430
-#define T_FULL 431
-#define T_INVISIBLE 432
-#define T_IPV4 433
-#define T_IPV6 434
-#define T_LOCOPS 435
-#define T_MAX_CLIENTS 436
-#define T_NCHANGE 437
-#define T_OPERWALL 438
-#define T_RECVQ 439
-#define T_REJ 440
-#define T_SERVER 441
-#define T_SERVNOTICE 442
-#define T_SET 443
-#define T_SKILL 444
-#define T_SPY 445
-#define T_SSL 446
-#define T_UMODES 447
-#define T_UNAUTH 448
-#define T_UNDLINE 449
-#define T_UNLIMITED 450
-#define T_UNRESV 451
-#define T_UNXLINE 452
-#define T_GLOBOPS 453
-#define T_WALLOP 454
-#define T_RESTART 455
-#define T_SERVICE 456
-#define T_SERVICES_NAME 457
-#define THROTTLE_TIME 458
-#define TRUE_NO_OPER_FLOOD 459
-#define UNKLINE 460
-#define USER 461
-#define USE_EGD 462
-#define USE_LOGGING 463
-#define VHOST 464
-#define VHOST6 465
-#define XLINE 466
-#define WARN_NO_NLINE 467
-#define T_SIZE 468
-#define T_FILE 469
+#define PORT 371
+#define QSTRING 372
+#define QUIET_ON_BAN 373
+#define REASON 374
+#define REDIRPORT 375
+#define REDIRSERV 376
+#define REGEX_T 377
+#define REHASH 378
+#define REMOTE 379
+#define REMOTEBAN 380
+#define RESTRICT_CHANNELS 381
+#define RSA_PRIVATE_KEY_FILE 382
+#define RSA_PUBLIC_KEY_FILE 383
+#define SSL_CERTIFICATE_FILE 384
+#define SSL_DH_PARAM_FILE 385
+#define T_SSL_CLIENT_METHOD 386
+#define T_SSL_SERVER_METHOD 387
+#define T_SSLV3 388
+#define T_TLSV1 389
+#define RESV 390
+#define RESV_EXEMPT 391
+#define SECONDS 392
+#define MINUTES 393
+#define HOURS 394
+#define DAYS 395
+#define WEEKS 396
+#define SENDQ 397
+#define SEND_PASSWORD 398
+#define SERVERHIDE 399
+#define SERVERINFO 400
+#define IRCD_SID 401
+#define TKLINE_EXPIRE_NOTICES 402
+#define T_SHARED 403
+#define T_CLUSTER 404
+#define TYPE 405
+#define SHORT_MOTD 406
+#define SPOOF 407
+#define SPOOF_NOTICE 408
+#define STATS_E_DISABLED 409
+#define STATS_I_OPER_ONLY 410
+#define STATS_K_OPER_ONLY 411
+#define STATS_O_OPER_ONLY 412
+#define STATS_P_OPER_ONLY 413
+#define TBOOL 414
+#define TMASKED 415
+#define TS_MAX_DELTA 416
+#define TS_WARN_DELTA 417
+#define TWODOTS 418
+#define T_ALL 419
+#define T_BOTS 420
+#define T_SOFTCALLERID 421
+#define T_CALLERID 422
+#define T_CCONN 423
+#define T_CCONN_FULL 424
+#define T_SSL_CIPHER_LIST 425
+#define T_DEAF 426
+#define T_DEBUG 427
+#define T_DLINE 428
+#define T_EXTERNAL 429
+#define T_FULL 430
+#define T_INVISIBLE 431
+#define T_IPV4 432
+#define T_IPV6 433
+#define T_LOCOPS 434
+#define T_MAX_CLIENTS 435
+#define T_NCHANGE 436
+#define T_OPERWALL 437
+#define T_RECVQ 438
+#define T_REJ 439
+#define T_SERVER 440
+#define T_SERVNOTICE 441
+#define T_SET 442
+#define T_SKILL 443
+#define T_SPY 444
+#define T_SSL 445
+#define T_UMODES 446
+#define T_UNAUTH 447
+#define T_UNDLINE 448
+#define T_UNLIMITED 449
+#define T_UNRESV 450
+#define T_UNXLINE 451
+#define T_GLOBOPS 452
+#define T_WALLOP 453
+#define T_RESTART 454
+#define T_SERVICE 455
+#define T_SERVICES_NAME 456
+#define THROTTLE_TIME 457
+#define TRUE_NO_OPER_FLOOD 458
+#define UNKLINE 459
+#define USER 460
+#define USE_EGD 461
+#define USE_LOGGING 462
+#define VHOST 463
+#define VHOST6 464
+#define XLINE 465
+#define WARN_NO_NLINE 466
+#define T_SIZE 467
+#define T_FILE 468
 
 
 
@@ -487,7 +485,7 @@ typedef union YYSTYPE
 
 
 /* Line 2077 of yacc.c  */
-#line 491 "conf_parser.h"
+#line 489 "conf_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/conf_parser.y b/src/conf_parser.y
index 8080f77..e473bc6 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -222,7 +222,6 @@ free_collect_item(struct CollectItem *item)
 %token  PATH
 %token  PING_COOKIE
 %token  PING_TIME
-%token  PING_WARNING
 %token  PORT
 %token  QSTRING
 %token  QUIET_ON_BAN
@@ -1309,7 +1308,6 @@ class_items:    class_items class_item | class_item;
 class_item:     class_name |
 		class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
                 class_ping_time |
-		class_ping_warning |
 		class_number_per_cidr |
                 class_number_per_ip |
                 class_connectfreq |
@@ -1335,12 +1333,6 @@ class_ping_time: PING_TIME '=' timespec ';'
     yy_class->ping_freq = $3;
 };
 
-class_ping_warning: PING_WARNING '=' timespec ';'
-{
-  if (conf_parser_ctx.pass == 1)
-    yy_class->ping_warning = $3;
-};
-
 class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
 {
   if (conf_parser_ctx.pass == 1)
@@ -1813,7 +1805,7 @@ shared_entry: T_SHARED
   if (conf_parser_ctx.pass == 2)
   {
     yy_conf = conf_make(CONF_ULINE);
-    yy_conf->action = SHARED_ALL;
+    yy_conf->flags = SHARED_ALL;
   }
 } '{' shared_items '}' ';'
 {
@@ -1860,50 +1852,50 @@ shared_user: USER '=' QSTRING ';'
 shared_type: TYPE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action = 0;
+    yy_conf->flags = 0;
 } '=' shared_types ';' ;
 
 shared_types: shared_types ',' shared_type_item | shared_type_item;
 shared_type_item: KLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_KLINE;
+    yy_conf->flags |= SHARED_KLINE;
 } | UNKLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNKLINE;
+    yy_conf->flags |= SHARED_UNKLINE;
 } | T_DLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_DLINE;
+    yy_conf->flags |= SHARED_DLINE;
 } | T_UNDLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNDLINE;
+    yy_conf->flags |= SHARED_UNDLINE;
 } | XLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_XLINE;
+    yy_conf->flags |= SHARED_XLINE;
 } | T_UNXLINE
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNXLINE;
+    yy_conf->flags |= SHARED_UNXLINE;
 } | RESV
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_RESV;
+    yy_conf->flags |= SHARED_RESV;
 } | T_UNRESV
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_UNRESV;
+    yy_conf->flags |= SHARED_UNRESV;
 } | T_LOCOPS
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action |= SHARED_LOCOPS;
+    yy_conf->flags |= SHARED_LOCOPS;
 } | T_ALL
 {
   if (conf_parser_ctx.pass == 2)
-    yy_conf->action = SHARED_ALL;
+    yy_conf->flags = SHARED_ALL;
 };
 
 /***************************************************************************
diff --git a/src/hash.c b/src/hash.c
index cd3fc1e..c7b8fd4 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -579,8 +579,8 @@ hash_find_userhost(const char *host)
  * side effects	-
  */
 void
-count_user_host(const char *user, const char *host, int *global_p,
-                int *local_p, int *icount_p)
+count_user_host(const char *user, const char *host, unsigned int *global_p,
+                unsigned int *local_p, unsigned int *icount_p)
 {
   dlink_node *ptr;
   struct UserHost *found_userhost;
diff --git a/src/hostmask.c b/src/hostmask.c
index c033e2d..e6ec09a 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -717,7 +717,7 @@ delete_one_address_conf(const char *address, struct MaskItem *conf)
     {
       dlinkDelete(&arec->node, &atable[hv]);
 
-      if (!conf->clients)
+      if (!conf->ref_count)
         conf_free(conf);
 
       MyFree(arec);
@@ -754,7 +754,7 @@ clear_out_address_conf(void)
 
       dlinkDelete(&arec->node, &atable[i]);
 
-      if (!arec->conf->clients)
+      if (!arec->conf->ref_count)
         conf_free(arec->conf);
       MyFree(arec);
     }
@@ -780,6 +780,7 @@ hostmask_send_expiration(struct AddressRec *arec)
     case CONF_GLINE:
       ban_type = 'G';
       break;
+    default: break;
   }
   
   sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
@@ -814,6 +815,7 @@ hostmask_expire_temporary(void)
           conf_free(arec->conf);
           MyFree(arec);
           break;
+        default: break;
       }
     }
   }
diff --git a/src/messages.tab b/src/messages.tab
index 09f7f98..b0514b7 100644
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -242,7 +242,7 @@ static struct NumericInfo replies[] = {
 /* 215 */  {"RPL_STATSILINE", ":%s 215 %s %c %s * %s@%s %d %s", NULL},
 /* 216 */  {"RPL_STATSKLINE", ":%s 216 %s %s %s * %s :%s", NULL},
 /* 217 */  {"RPL_STATSQLINE", ":%s 217 %s %c %s :%s", NULL},
-/* 218 */  {"RPL_STATSYLINE", ":%s 218 %s %c %s %d %d %d %lu %lu %d %d/%d %d/%d %s", NULL},
+/* 218 */  {"RPL_STATSYLINE", ":%s 218 %s %c %s %u %u %u %u %u %u %u/%u %u/%u %s", NULL},
 /* 219 */  {"RPL_ENDOFSTATS", ":%s 219 %s %c :End of /STATS report", NULL},
 /* 220 */  {"RPL_STATSPLINE", ":%s 220 %s %c %d %s %d %s :%s", NULL},
 /* 221 */  {"RPL_UMODEIS", ":%s 221 %s %s", NULL},
diff --git a/src/s_gline.c b/src/s_gline.c
index 3d563be..ef30c87 100644
--- a/src/s_gline.c
+++ b/src/s_gline.c
@@ -45,27 +45,25 @@ static void expire_pending_glines(struct gline_pending *);
 struct MaskItem *
 find_is_glined(const char *host, const char *user)
 {
-  struct irc_ssaddr iphost, *piphost;
+  struct irc_ssaddr iphost, *piphost = NULL;
   struct MaskItem *conf = NULL;
-  int t;
+  int t = 0;
+  int aftype = 0;
 
-  if ((t = parse_netmask(host, &iphost, &t)) != HM_HOST)
+  if ((t = parse_netmask(host, &iphost, NULL)) != HM_HOST)
   {
 #ifdef IPV6
     if (t == HM_IPV6)
-      t = AF_INET6;
+      aftype = AF_INET6;
     else
 #endif
-      t = AF_INET;
+      aftype = AF_INET;
     piphost = &iphost;
   }
   else
-  {
-    t = 0;
     piphost = NULL;
-  }
 
-  conf = find_conf_by_address(host, piphost, CONF_GLINE, t, user, NULL, 0);
+  conf = find_conf_by_address(host, piphost, CONF_GLINE, aftype, user, NULL, 0);
   return conf;
 }
 
diff --git a/src/s_user.c b/src/s_user.c
index c711446..30e7470 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -311,7 +311,7 @@ register_local_user(struct Client *source_p)
   /* Straight up the maximum rate of flooding... */
   source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
-  if (!execute_callback(client_check_cb, source_p, source_p->username))
+  if (!check_client(source_p))
     return;
 
   if (valid_hostname(source_p->host) == 0)
@@ -1195,10 +1195,9 @@ void
 oper_up(struct Client *source_p)
 {
   const unsigned int old = source_p->umodes;
-  const struct MaskItem *conf = NULL;
+  const struct MaskItem *conf = source_p->localClient->confs.head->data;
 
   assert(source_p->localClient->confs.head);
-  conf = source_p->localClient->confs.head->data;
 
   ++Count.oper;
   SetOper(source_p);