diff --git a/src/arch/common.ins b/src/arch/common.ins
index 15acb33..1d746c7 100644
--- a/src/arch/common.ins
+++ b/src/arch/common.ins
@@ -1,5 +1,5 @@
 /* $Id$ */
-	{ "db",	AOT_NONE, 0x0,	AOT_IMMEDIATE | 0x1,	AOT_NONE, AOT_NONE },
-	{ "dw",	AOT_NONE, 0x0,	AOT_IMMEDIATE | 0x2,	AOT_NONE, AOT_NONE },
-	{ "dl",	AOT_NONE, 0x0,	AOT_IMMEDIATE | 0x4,	AOT_NONE, AOT_NONE },
-	{ "dq",	AOT_NONE, 0x0,	AOT_IMMEDIATE | 0x8,	AOT_NONE, AOT_NONE },
+	{ "db",	AOT_NONE, 0x0,	AO_IMMEDIATE(0, 1, 0),	AOT_NONE, AOT_NONE },
+	{ "dw",	AOT_NONE, 0x0,	AO_IMMEDIATE(0, 2, 0),	AOT_NONE, AOT_NONE },
+	{ "dl",	AOT_NONE, 0x0,	AO_IMMEDIATE(0, 4, 0),	AOT_NONE, AOT_NONE },
+	{ "dq",	AOT_NONE, 0x0,	AO_IMMEDIATE(0, 8, 0),	AOT_NONE, AOT_NONE },