-#define TYPE_Fx 0x0000000000010000ULL
-#define TYPE_Ic 0x0000000000020000ULL
-#define TYPE_In 0x0000000000040000ULL
-#define TYPE_Lb 0x0000000000080000ULL
-#define TYPE_Li 0x0000000000100000ULL
-#define TYPE_Lk 0x0000000000200000ULL
-#define TYPE_Ms 0x0000000000400000ULL
-#define TYPE_Mt 0x0000000000800000ULL
-#define TYPE_Nd 0x0000000001000000ULL
-#define TYPE_Nm 0x0000000002000000ULL
-#define TYPE_Nx 0x0000000004000000ULL
-#define TYPE_Ox 0x0000000008000000ULL
-#define TYPE_Pa 0x0000000010000000ULL
-#define TYPE_Rs 0x0000000020000000ULL
-#define TYPE_Sh 0x0000000040000000ULL
-#define TYPE_Ss 0x0000000080000000ULL
-#define TYPE_St 0x0000000100000000ULL
-#define TYPE_Sy 0x0000000200000000ULL
-#define TYPE_Tn 0x0000000400000000ULL
-#define TYPE_Va 0x0000000800000000ULL
+#define TYPE_Tn 0x0000000000010000ULL
+#define TYPE_Er 0x0000000000020000ULL
+#define TYPE_Ev 0x0000000000040000ULL
+#define TYPE_Sy 0x0000000000080000ULL
+#define TYPE_Sh 0x0000000000100000ULL
+#define TYPE_In 0x0000000000200000ULL
+#define TYPE_Ss 0x0000000000400000ULL
+#define TYPE_Ox 0x0000000000800000ULL
+#define TYPE_An 0x0000000001000000ULL
+#define TYPE_Mt 0x0000000002000000ULL
+#define TYPE_St 0x0000000004000000ULL
+#define TYPE_Bx 0x0000000008000000ULL
+#define TYPE_At 0x0000000010000000ULL
+#define TYPE_Nx 0x0000000020000000ULL
+#define TYPE_Fx 0x0000000040000000ULL
+#define TYPE_Lk 0x0000000080000000ULL
+#define TYPE_Ms 0x0000000100000000ULL
+#define TYPE_Bsx 0x0000000200000000ULL
+#define TYPE_Dx 0x0000000400000000ULL
+#define TYPE_Rs 0x0000000800000000ULL