-#define T_DESTINATION(entry) MOD((entry).opcode / 1000, 1000)
-#define T_NODWARVES(entry) ((entry).opcode / 1000000 == 100)
-#define T_MOTION(entry) MOD((entry).opcode, 1000)
-#define T_TERMINATE(entry) (T_MOTION(entry) == 1)
-#define T_STOP(entry) ((entry).stop)
-#define T_HIGH(entry) ((entry).opcode / 1000)
-#define T_LOW(entry) ((entry).opcode % 1000)
+#define T_DESTINATION(entry) MOD((entry).dest, 1000)
+#define T_NODWARVES(entry) ((entry).dest / 1000 == 100)
+#define T_HIGH(entry) ((entry).dest)
+#define T_TERMINATE(entry) ((entry).motion == 1)