diff --git a/blk/662 b/blk/662
index 32e32e6..58d4618 100644
--- a/blk/662
+++ b/blk/662
@@ -1,5 +1,6 @@
 ( 0000 000d dddd 0000 )
-: OPRd CREATE , DOES> @ SWAP 4 LSHIFT OR A,, ;
+: _Rdp ( op rd -- op' place Rd ) 4 LSHIFT OR ;
+: OPRd CREATE , DOES> @ SWAP _Rdp A,, ;
 0b1001010000000101 OPRd ASR,   0b1001010000000000 OPRd COM,
 0b1001010000001010 OPRd DEC,   0b1001010000000011 OPRd INC,
 0b1001001000000110 OPRd LAC,   0b1001001000000101 OPRd LAS,
diff --git a/blk/663 b/blk/663
index 5907a51..5a248cc 100644
--- a/blk/663
+++ b/blk/663
@@ -1,9 +1,8 @@
 ( 0000 00rd dddd rrrr )
 : OPRdRr CREATE C, DOES> C@ ( rd rr op )
     OVER 0x10 AND 3 RSHIFT OR ( rd rr op' )
-    2 PICK 0x10 AND 4 RSHIFT OR ( rd rr op' )
     8 LSHIFT OR 0xff0f AND ( rd op' )
-    SWAP 0xf AND 4 LSHIFT OR A,, ;
+    SWAP _Rdp A,, ;
 0x1c OPRdRr ADC,   0x0c OPRdRr ADD,    0x20 OPRdRr AND,
 0x14 OPRdRr CP,    0x04 OPRdRr CPC,    0x10 OPRdRr CPSE,
 0x24 OPRdRr EOR,   0x2c OPRdRr MOV,    0x9c OPRdRr MUL,