diff --git a/include/ircd.h b/include/ircd.h
index a53b10f74..b5d8a48d3 100644
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -69,7 +69,7 @@ extern int cold_start;
 extern int dorehash;
 extern int dorehashbans;
 extern int doremotd;
-extern int kline_queued;
+extern bool kline_queued;
 extern int server_state_foreground;
 extern int opers_see_all_users; /* sno_farconnect.so loaded, operspy without
 				   accountability, etc */
diff --git a/ircd/client.c b/ircd/client.c
index 0902af26c..bd6982d07 100644
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -475,7 +475,7 @@ check_banned_lines(void)
 void
 check_klines_event(void *unused)
 {
-	kline_queued = 0;
+	kline_queued = false;
 	check_klines();
 }
 
diff --git a/ircd/ircd.c b/ircd/ircd.c
index e6ff1d2ca..e87689e80 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -102,7 +102,7 @@ char **myargv;
 int dorehash = 0;
 int dorehashbans = 0;
 int doremotd = 0;
-int kline_queued = 0;
+bool kline_queued = false;
 int server_state_foreground = 0;
 int opers_see_all_users = 0;
 int ssl_ok = 0;
diff --git a/ircd/newconf.c b/ircd/newconf.c
index 7d6bab440..ccc7afc0a 100644
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -1553,7 +1553,7 @@ conf_set_general_kline_delay(void *data)
 	ConfigFileEntry.kline_delay = *(unsigned int *) data;
 
 	/* THIS MUST BE HERE to stop us being unable to check klines */
-	kline_queued = 0;
+	kline_queued = false;
 }
 
 static void
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 4456d1afb..c1861ec3a 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -106,7 +106,7 @@ mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	struct ConfItem *aconf;
 	int tkline_time = 0;
 	int loc = 1;
-	int propagated = ConfigFileEntry.use_propagated_bans;
+	bool propagated = ConfigFileEntry.use_propagated_bans;
 
 	if(!IsOperK(source_p))
 	{
@@ -157,7 +157,7 @@ mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 			return;
 
 		/* Set as local-only. */
-		propagated = 0;
+		propagated = false;
 	}
 	/* if we have cluster servers, send it to them.. */
 	else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
@@ -218,11 +218,11 @@ mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
 	if(ConfigFileEntry.kline_delay)
 	{
-		if(kline_queued == 0)
+		if(!kline_queued)
 		{
 			rb_event_addonce("check_klines", check_klines_event, NULL,
 					 ConfigFileEntry.kline_delay);
-			kline_queued = 1;
+			kline_queued = true;
 		}
 	}
 	else
@@ -328,11 +328,11 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 
 	if(ConfigFileEntry.kline_delay)
 	{
-		if(kline_queued == 0)
+		if(!kline_queued)
 		{
 			rb_event_addonce("check_klines", check_klines_event, NULL,
 					 ConfigFileEntry.kline_delay);
-			kline_queued = 1;
+			kline_queued = true;
 		}
 	}
 	else
@@ -353,7 +353,7 @@ mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 	char splat[] = "*";
 	char *h = LOCAL_COPY(parv[1]);
 	struct ConfItem *aconf;
-	int propagated = 1;
+	bool propagated = true;
 
 	if(!IsOperUnkline(source_p))
 	{
@@ -406,7 +406,7 @@ mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 		if(match(parv[3], me.name) == 0)
 			return;
 
-		propagated = 0;
+		propagated = false;
 	}
 
 	aconf = find_exact_conf_by_address(host, CONF_KILL, user);
diff --git a/modules/m_names.c b/modules/m_names.c
index 1bb8a556c..c7e142eb9 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -107,8 +107,6 @@ m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		sendto_one(source_p, form_str(RPL_ENDOFNAMES),
 			   me.name, source_p->name, "*");
 	}
-
-	return;
 }
 
 /*
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 8f8861e1c..04e02617b 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -66,7 +66,7 @@ static void me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct
 
 static bool valid_xline(struct Client *, const char *, const char *);
 static void apply_xline(struct Client *client_p, const char *name,
-			const char *reason, int temp_time, int propagated);
+			const char *reason, int temp_time, bool propagated);
 static void propagate_xline(struct Client *source_p, const char *target,
 			    int temp_time, const char *name, const char *type, const char *reason);
 static void cluster_xline(struct Client *source_p, int temp_time,
@@ -76,7 +76,7 @@ static void handle_remote_xline(struct Client *source_p, int temp_time,
 				const char *name, const char *reason);
 static void handle_remote_unxline(struct Client *source_p, const char *name);
 static void remove_xline(struct Client *source_p, const char *name,
-			 int propagated);
+			 bool propagated);
 
 struct Message xline_msgtab = {
 	"XLINE", 0, 0, 0, 0,
@@ -107,7 +107,7 @@ mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	const char *target_server = NULL;
 	int temp_time;
 	int loc = 1;
-	int propagated = ConfigFileEntry.use_propagated_bans;
+	bool propagated = ConfigFileEntry.use_propagated_bans;
 
 	if(!IsOperXline(source_p))
 	{
@@ -155,7 +155,7 @@ mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 			return;
 
 		/* Set as local-only. */
-		propagated = 0;
+		propagated = false;
 	}
 	else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
 		cluster_xline(source_p, temp_time, name, reason);
@@ -232,7 +232,7 @@ handle_remote_xline(struct Client *source_p, int temp_time, const char *name, co
 		return;
 	}
 
-	apply_xline(source_p, name, reason, temp_time, 0);
+	apply_xline(source_p, name, reason, temp_time, false);
 }
 
 /* valid_xline()
@@ -264,7 +264,7 @@ valid_xline(struct Client *source_p, const char *gecos, const char *reason)
 }
 
 void
-apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time, int propagated)
+apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time, bool propagated)
 {
 	struct ConfItem *aconf;
 
@@ -385,7 +385,7 @@ cluster_xline(struct Client *source_p, int temp_time, const char *name, const ch
 static void
 mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	int propagated = 1;
+	bool propagated = true;
 
 	if(!IsOperXline(source_p))
 	{
@@ -407,7 +407,7 @@ mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 		if(match(parv[3], me.name) == 0)
 			return;
 
-		propagated = 0;
+		propagated = false;
 	}
 	/* cluster{} moved to remove_xline */
 
@@ -452,7 +452,7 @@ handle_remote_unxline(struct Client *source_p, const char *name)
 			     source_p->servptr->name, SHARED_UNXLINE))
 		return;
 
-	remove_xline(source_p, name, 0);
+	remove_xline(source_p, name, false);
 }
 
 static void