1 files changed, 3 insertions, 9 deletions

diff --git a/builtin.c b/builtin.c
index 87f7fb23..ab247a8b 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2190,13 +2190,7 @@ do_print(int nargs, int redirtype)
 				DEREF(args_array[i]);
 			fatal(_("attempt to use array `%s' in a scalar context"), array_vname(tmp));
 		}
-
-		if (tmp->type == Node_typedregex)
-			args_array[i] = force_string(tmp);
-		else if (   (tmp->flags & STRCUR) == 0
-			 || (   tmp->stfmt != STFMT_UNUSED
-			     && tmp->stfmt != OFMTidx))
-				args_array[i] = format_val(OFMT, OFMTidx, tmp);
+		args_array[i] = force_string_ofmt(tmp);
 	}
 
 	if (redir_exp != NULL) {
@@ -3953,14 +3947,14 @@ do_typeof(int nargs)
 		break;
 	case Node_val:
 	case Node_var:
-		switch (arg->flags & (STRING|NUMBER|MAYBE_NUM)) {
+		switch (fixtype(arg)->flags & (STRING|NUMBER|MAYBE_NUM)) {
 		case STRING:
 			res = "string";
 			break;
 		case NUMBER:
 			res = "number";
 			break;
-		case STRING|MAYBE_NUM:
+		case NUMBER|MAYBE_NUM:
 			res = "strnum";
 			break;
 		case NUMBER|STRING: