-#define T_DESTINATION(entry) MOD(labs(entry) / 1000, 1000)
-#define T_NODWARVES(entry) labs(entry) / 1000000 == 100
-#define T_MOTION(entry) MOD(labs(entry), 1000)
-#define L_SPEAK(loc) ((loc) - 500)
+#define T_DESTINATION(entry) MOD(labs((entry).opcode) / 1000, 1000)
+#define T_NODWARVES(entry) labs((entry).opcode) / 1000000 == 100
+#define T_MOTION(entry) MOD(labs((entry).opcode), 1000)