diff --git a/src/helper/command.c b/src/helper/command.c
index ada745f2a..5ac57a1e2 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -78,7 +78,7 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	for (i = 0; i < argc; i++)
 	{
 		int len;
-		char *w=Jim_GetString(argv[i], &len);
+		const char *w=Jim_GetString(argv[i], &len);
 		if (*w=='#')
 		{
 			/* hit an end of line comment */
@@ -539,7 +539,6 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
 	size_t nbytes;
 	const char *ptr;
 	Jim_Interp *interp;
-	command_context_t *context;
 
 	/* make it a char easier to read code */
 	ptr = _ptr;
@@ -549,19 +548,11 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
 		return 0;
 	}
 
-	context = Jim_GetAssocData(interp, "context");
-	if (context == NULL)
-	{
-		LOG_ERROR("openocd_jim_fwrite: no command context");
-		/* TODO: Where should this go? */		
-		return n;
-	}
-
 	/* do we have to chunk it? */
 	if (ptr[nbytes] == 0)
 	{
 		/* no it is a C style string */
-		command_output_text(context, ptr);
+		LOG_USER_N("%s", ptr);
 		return strlen(ptr);
 	}
 	/* GRR we must chunk - not null terminated */
@@ -578,7 +569,7 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
 		/* terminate it */
 		chunk[n] = 0;
 		/* output it */
-		command_output_text(context, chunk);
+		LOG_USER_N("%s", chunk);
 		ptr += x;
 		nbytes -= x;
 	}
@@ -597,24 +588,16 @@ static int openocd_jim_vfprintf(void *cookie, const char *fmt, va_list ap)
 	char *cp;
 	int n;
 	Jim_Interp *interp;
-	command_context_t *context;
 
 	n = -1;
 	interp = cookie;
 	if (interp == NULL)
 		return n;
 
-	context = Jim_GetAssocData(interp, "context");
-	if (context == NULL)
-	{
-		LOG_ERROR("openocd_jim_vfprintf: no command context");
-		return n;
-	}
-
 	cp = alloc_vprintf(fmt, ap);
 	if (cp)
 	{
-		command_output_text(context, cp);
+		LOG_USER_N("%s", cp);
 		n = strlen(cp);
 		free(cp);
 	}
diff --git a/src/helper/log.h b/src/helper/log.h
index 7a7c90cbc..afe5da893 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -109,10 +109,10 @@ extern int debug_level;
  * error codes < 100
  */
 #define ERROR_OK					(0)
-#define ERROR_INVALID_ARGUMENTS		(-1)
+#define ERROR_INVALID_ARGUMENTS		ERROR_COMMAND_SYNTAX_ERROR
 #define ERROR_NO_CONFIG_FILE		(-2)
 #define ERROR_BUF_TOO_SMALL			(-3)
-/* see "Error:" message for meaningful message to the user. The caller should 
+/* see "Error:" log entry for meaningful message to the user. The caller should 
  * make no assumptions about what went wrong and try to handle the problem.
  */
 #define ERROR_FAIL       			(-4)