Changes the `rcheck` and `rfail` series of macros to use the same argument order
Merge branch 'vexocide/3114' into next