Also, move the handling earlier so that they're checked before the rest of the instruction is checked.