diff --git a/eval_intern.h b/eval_intern.h
index a0ecb5086b..69e9134dbb 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -120,14 +120,10 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
   _th->tag = _tag.prev; \
 } while (0)
 
-#define TH_POP_TAG2() \
+#define TH_TMPPOP_TAG() \
   _th->tag = _tag.prev
 
-#define TH_PUSH_TAG2() (_th->tag = &_tag, 0)
-
-#define TH_TMPPOP_TAG() TH_POP_TAG2()
-
-#define TH_REPUSH_TAG() TH_PUSH_TAG2()
+#define TH_REPUSH_TAG() (void)(_th->tag = &_tag)
 
 #define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
 #define POP_TAG()      TH_POP_TAG()
@@ -153,7 +149,7 @@ rb_threadptr_tag_jump(rb_thread_t *th, int st)
   [ISO/IEC 9899:1999] 7.13.1.1
 */
 #define TH_EXEC_TAG() \
-    (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(_th) : TH_PUSH_TAG2())
+    (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(_th) : (TH_REPUSH_TAG(), 0))
 
 #define EXEC_TAG() \
   TH_EXEC_TAG()
diff --git a/vm.c b/vm.c
index 7d792b8f4c..36fd511bfa 100644
--- a/vm.c
+++ b/vm.c
@@ -1543,7 +1543,7 @@ vm_exec(rb_thread_t *th)
 	    if (VM_FRAME_TYPE_FINISH_P(th->cfp)) {
 		vm_pop_frame(th);
 		th->errinfo = err;
-		TH_POP_TAG2();
+		TH_TMPPOP_TAG();
 		JUMP_TAG(state);
 	    }
 	    else {