diff --git a/scripts/base/frameworks/notice/actions/pp-alarms.bro b/scripts/base/frameworks/notice/actions/pp-alarms.bro
index 89cf310ac5..609f6a6bf1 100644
--- a/scripts/base/frameworks/notice/actions/pp-alarms.bro
+++ b/scripts/base/frameworks/notice/actions/pp-alarms.bro
@@ -10,19 +10,19 @@ module Notice;
 export {
 	## Activate pretty-printed alarm summaries.
 	const pretty_print_alarms = T &redef;
-
+	
 	## Address to send the pretty-printed reports to. Default if not set is
 	## :bro:id:`Notice::mail_dest`.
 	const mail_dest_pretty_printed = "" &redef;
-
-        ## If an address from one of these networks is reported, we mark
+	
+	## If an address from one of these networks is reported, we mark
 	## the entry with an addition quote symbol (i.e., ">"). Many MUAs
 	## then highlight such lines differently.
 	global flag_nets: set[subnet] &redef;
-
+	
 	## Function that renders a single alarm. Can be overidden.
 	global pretty_print_alarm: function(out: file, n: Info) &redef;
-
+	
 	## Force generating mail file, even if reading from traces or no mail
 	## destination is defined. This is mainly for testing.
 	global force_email_summaries = F &redef;
@@ -38,7 +38,7 @@ function want_pp() : bool
 	{
 	if ( force_email_summaries )
 		return T;
-
+	
 	return (pretty_print_alarms && ! reading_traces()
 		&& (mail_dest != "" || mail_dest_pretty_printed != ""));
 	}
@@ -48,7 +48,7 @@ function pp_open()
 	{
 	if ( pp_alarms_open )
 		return;
-
+	
 	pp_alarms_open = T;
 	pp_alarms = open(pp_alarms_name);
 	}
@@ -58,17 +58,17 @@ function pp_send(rinfo: Log::RotationInfo)
 	{
 	if ( ! pp_alarms_open )
 		return;
-
+	
 	write_file(pp_alarms, "\n\n--\n[Automatically generated]\n\n");
 	close(pp_alarms);
 	pp_alarms_open = F;
-
+	
 	local from = strftime("%H:%M:%S", rinfo$open);
 	local to = strftime("%H:%M:%S", rinfo$close);
 	local subject = fmt("Alarm summary from %s-%s", from, to);
 	local dest = mail_dest_pretty_printed != "" ? mail_dest_pretty_printed
 		: mail_dest;
-
+	
 	if ( dest == "" )
 		# No mail destination configured, just leave the file alone. This is mainly for
 		# testing.
@@ -90,7 +90,7 @@ function pp_postprocessor(info: Log::RotationInfo): bool
 	{
 	if ( want_pp() )
 		pp_send(info);
-
+	
 	return T;
 	}
 
@@ -98,7 +98,7 @@ event bro_init()
 	{
 	if ( ! want_pp() )
 		return;
-
+	
 	# This replaces the standard non-pretty-printing filter.
 	Log::add_filter(Notice::ALARM_LOG,
 			[$name="alarm-mail", $writer=Log::WRITER_NONE,
@@ -110,13 +110,13 @@ event notice(n: Notice::Info) &priority=-5
 	{
 	if ( ! want_pp() )
 		return;
-
+	
 	if ( ACTION_ALARM !in n$actions )
 		return;
-
+	
 	if ( ! pp_alarms_open )
 		pp_open();
-
+	
 	pretty_print_alarm(pp_alarms, n);
 	}
 
@@ -126,12 +126,12 @@ function do_msg(out: file, n: Info, line1: string, line2: string, line3: string,
 @ifdef ( Notice::ACTION_ADD_GEODATA ) # Make tests happy, cyclic dependency.
 	if ( n?$remote_location && n$remote_location?$country_code  )
 		country = fmt(" (remote location %s)", n$remote_location$country_code);
-@endif		
-		
+@endif
+	
 	line1 = cat(line1, country);
-
+	
 	local resolved = "";
-
+	
 	if ( host1 != 0.0.0.0 )
 		resolved = fmt("%s   # %s = %s", resolved, host1, name1);
 	
@@ -151,60 +151,58 @@ function do_msg(out: file, n: Info, line1: string, line2: string, line3: string,
 function pretty_print_alarm(out: file, n: Info)
 	{
 	local pdescr = "";
-
+	
 @if ( Cluster::is_enabled() )
 	pdescr = "local";
-
+	
 	if ( n?$src_peer )
 		pdescr = n$src_peer?$descr ? n$src_peer$descr : fmt("%s", n$src_peer$host);
 
 	pdescr = fmt("<%s> ", pdescr);
 @endif
-
+	
 	local msg = fmt( "%s%s", pdescr, n$msg);
-
+	
 	local who = "";
 	local h1 = 0.0.0.0;
 	local h2 = 0.0.0.0;
-
+	
 	local orig_p = "";
 	local resp_p = "";
-
+	
 	if ( n?$id )
 		{
 		h1 = n$id$orig_h;
 		h2 = n$id$resp_h;
 		who = fmt("%s:%s -> %s:%s", h1, n$id$orig_p, h2, n$id$resp_p);
 		}
-
 	else if ( n?$src && n?$dst )
 		{
 		h1 = n$src;
 		h2 = n$dst;
 		who = fmt("%s -> %s", h1, h2);
 		}
-
 	else if ( n?$src )
 		{
 		h1 = n$src;
 		who = fmt("%s%s", h1, (n?$p ? fmt(":%s", n$p) : ""));
 		}
-
+	
 	if ( n?$uid )
 		who = fmt("%s (uid %s)", who, n$uid );
 	
 	local flag = (h1 in flag_nets || h2 in flag_nets);
-
+	
 	local line1 = fmt(">%s %D %s %s", (flag ? ">" : " "), network_time(), n$note, who);
 	local line2 = fmt("   %s", msg);
 	local line3 = n?$sub ? fmt("   %s", n$sub) : "";
-
+	
 	if ( h1 == 0.0.0.0 )
 		{
 		do_msg(out, n, line1, line2, line3, h1, "", h2, "");
 		return;
 		}
-
+	
 	if ( reading_traces() )
 		{
 		do_msg(out, n, line1, line2, line3, h1, "<skipped>", h2, "<skipped>");