i386: simplify flow control in irettraps
(cherry picked from commit 54e1546e09340682c871ad1387e42a765e117ad3)