diff --git a/library/amiga_rexxvars.c b/library/amiga_rexxvars.c
index 9436b29..4850894 100644
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.3 2005-01-09 10:10:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -50,12 +50,12 @@
 
 /****************************************************************************/
 
-STATIC struct Library * RexxSysBase;
+static struct Library * RexxSysBase;
 
 /****************************************************************************/
 
 #if defined(__amigaos4__)
-STATIC struct RexxSysIFace * IRexxSys;
+static struct RexxSysIFace * IRexxSys;
 #endif /* __amigaos4__ */
 
 /****************************************************************************/
@@ -144,7 +144,7 @@ CheckRexxMsg(struct RexxMsg *message)
 LONG
 GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 {
-	STATIC TEXT buffer[256];
+	static UBYTE buffer[256];
 	LONG result;
 
 	/* The following uses a function which was added to rexxsyslib.library V45.
diff --git a/library/amiga_setsuperattrs.c b/library/amiga_setsuperattrs.c
index 5e0c3f2..8900489 100644
--- a/library/amiga_setsuperattrs.c
+++ b/library/amiga_setsuperattrs.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_setsuperattrs.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_setsuperattrs.c,v 1.3 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -46,7 +46,7 @@
 
 /****************************************************************************/
 
-STATIC ULONG
+static ULONG
 SetSuperAttrsA(Class * cl,Object * obj,struct TagItem * tags)
 {
 	ULONG result = 0;
diff --git a/library/changes b/library/changes
index f631c75..8f953ee 100644
--- a/library/changes
+++ b/library/changes
@@ -25,6 +25,10 @@
   all IsInterative() tests. I verified that IsInteractive() will always
   return FALSE for NIL: type file handles.
 
+- Dropped the special flag variable used by the abort() function that
+  tracks whether or not console output is possible. We now use the
+  global "__no_standard_io" instead.
+
 
 c.lib 1.185 (2.1.2005)
 
diff --git a/library/signal_data.c b/library/signal_data.c
index 4308511..a4fa88e 100644
--- a/library/signal_data.c
+++ b/library/signal_data.c
@@ -1,5 +1,5 @@
 /*
- * $Id: signal_data.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: signal_data.c,v 1.4 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,7 +54,3 @@ int __signals_blocked;
 /****************************************************************************/
 
 BOOL __check_abort_enabled = TRUE;
-
-/****************************************************************************/
-
-BOOL __termination_message_disabled;
diff --git a/library/signal_headers.h b/library/signal_headers.h
index 2a78cb3..18bdb32 100644
--- a/library/signal_headers.h
+++ b/library/signal_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: signal_headers.h,v 1.5 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: signal_headers.h,v 1.6 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -76,10 +76,6 @@ extern int NOCOMMON __signals_blocked;
 
 /****************************************************************************/
 
-extern BOOL NOCOMMON __termination_message_disabled;
-
-/****************************************************************************/
-
 #ifndef _STDLIB_HEADERS_H
 #include "stdlib_headers.h"
 #endif /* _STDLIB_HEADERS_H */
diff --git a/library/socket_init_exit.c b/library/socket_init_exit.c
index 988b0aa..e588c28 100644
--- a/library/socket_init_exit.c
+++ b/library/socket_init_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_init_exit.c,v 1.7 2005-01-02 09:07:08 obarthel Exp $
+ * $Id: socket_init_exit.c,v 1.8 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -244,15 +244,13 @@ __socket_init(void)
 
 			SHOWVALUE(daemon_socket);
 
-			/* Whatever happens, the following likely won't end up
-			 * in the console...
-			 */
-			__termination_message_disabled = TRUE;
-
 			/* Shut down the three standard I/O streams. */
 			for(i = STDIN_FILENO ; i <= STDERR_FILENO ; i++)
 				close(i);
 
+			/* The standard I/O streams are no longer attached to a console. */
+			__no_standard_io = TRUE;
+
 			/* Put the socket into the three standard I/O streams. */
 			for(i = STDIN_FILENO ; i <= STDERR_FILENO ; i++)
 			{
@@ -284,9 +282,6 @@ __socket_init(void)
 
 			/* This program now runs as an internet superserver client (daemon). */
 			__is_daemon = TRUE;
-
-			/* The standard I/O streams are no longer attached to a console. */
-			__no_standard_io = TRUE;
 		}
 	}
 
diff --git a/library/stdio_init_exit.c b/library/stdio_init_exit.c
index d80af2f..a8fe313 100644
--- a/library/stdio_init_exit.c
+++ b/library/stdio_init_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_init_exit.c,v 1.8 2005-01-09 09:54:33 obarthel Exp $
+ * $Id: stdio_init_exit.c,v 1.9 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -171,7 +171,7 @@ __stdio_init(void)
 
 				iob_flags		= IOBF_IN_USE | IOBF_WRITE | IOBF_NO_NUL | IOBF_BUFFER_MODE_NONE;
 				fd_flags		= FDF_IN_USE | FDF_WRITE;
-				default_file	= ZERO;
+				default_file	= ZERO; /* NOTE: this is really initialized later; see below... */
 				break;
 		}
 
diff --git a/library/stdlib_setenv.c b/library/stdlib_setenv.c
index 677efe2..05bceeb 100644
--- a/library/stdlib_setenv.c
+++ b/library/stdlib_setenv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_setenv.c,v 1.4 2005-01-02 09:07:18 obarthel Exp $
+ * $Id: stdlib_setenv.c,v 1.5 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -61,7 +61,7 @@ struct LocalVariable
 
 /****************************************************************************/
 
-STATIC struct LocalVariable * __lv_root;
+static struct LocalVariable * __lv_root;
 
 /****************************************************************************/
 
diff --git a/library/stdlib_showerror.c b/library/stdlib_showerror.c
index e24e80f..b92c363 100644
--- a/library/stdlib_showerror.c
+++ b/library/stdlib_showerror.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_showerror.c,v 1.7 2005-01-09 09:40:32 obarthel Exp $
+ * $Id: stdlib_showerror.c,v 1.8 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -156,20 +156,18 @@ __show_error(const char * message)
 		{
 			/* Try to print the error message on the default error output stream. */
 			output = ErrorOutput();
-			if(output == ZERO)
-				output = Output();
 		}
 		#else
 		{
 			struct Process * this_process = (struct Process *)FindTask(NULL);
 
-			if(this_process->pr_CES != ZERO)
-				output = this_process->pr_CES;
-			else
-				output = Output();
+			output = this_process->pr_CES;
 		}
 		#endif /* __amigaos4__ */
 
+		if(output == ZERO)
+			output = Output();
+
 		if(output != ZERO)
 		{
 			Write(output,(STRPTR)message,(LONG)strlen(message));
diff --git a/library/stdlib_system.c b/library/stdlib_system.c
index 43f04bf..a84d343 100644
--- a/library/stdlib_system.c
+++ b/library/stdlib_system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_system.c,v 1.2 2005-01-02 09:07:19 obarthel Exp $
+ * $Id: stdlib_system.c,v 1.3 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -69,7 +69,7 @@ system(const char * command)
 	}
 	else
 	{
-		STATIC const struct TagItem system_tags[2] =
+		static const struct TagItem system_tags[2] =
 		{
 			{ SYS_UserShell,	TRUE },
 			{ TAG_END,			0 }
diff --git a/library/stdlib_termination_message.c b/library/stdlib_termination_message.c
index 259ebca..d09731e 100644
--- a/library/stdlib_termination_message.c
+++ b/library/stdlib_termination_message.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_termination_message.c,v 1.3 2005-01-02 09:07:19 obarthel Exp $
+ * $Id: stdlib_termination_message.c,v 1.4 2005-01-09 10:10:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,7 +54,7 @@ __print_termination_message(const char * termination_message)
 	{
 		termination_message_printed = TRUE;
 
-		if(NOT __termination_message_disabled && NOT __no_standard_io)
+		if(NOT __no_standard_io)
 		{
 			fputs((termination_message != NULL) ? termination_message : "Abnormal program termination",stderr);