diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 54b389a6959..fd4e56e3973 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -164,103 +164,103 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut,
   if (in < (dest)lo || in > hi) return DISP_E_OVERFLOW; *out = in; return S_OK; }
 
 /* I1 */
-POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX);
-BOTHTST(signed char, SHORT, VarI1FromI2, I1_MIN, I1_MAX);
-BOTHTST(signed char, LONG, VarI1FromI4, I1_MIN, I1_MAX);
-SIMPLE(signed char, VARIANT_BOOL, VarI1FromBool);
-POSTST(signed char, USHORT, VarI1FromUI2, I1_MAX);
-POSTST(signed char, ULONG, VarI1FromUI4, I1_MAX);
-BOTHTST(signed char, LONG64, VarI1FromI8, I1_MIN, I1_MAX);
-POSTST(signed char, ULONG64, VarI1FromUI8, I1_MAX);
+POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX)
+BOTHTST(signed char, SHORT, VarI1FromI2, I1_MIN, I1_MAX)
+BOTHTST(signed char, LONG, VarI1FromI4, I1_MIN, I1_MAX)
+SIMPLE(signed char, VARIANT_BOOL, VarI1FromBool)
+POSTST(signed char, USHORT, VarI1FromUI2, I1_MAX)
+POSTST(signed char, ULONG, VarI1FromUI4, I1_MAX)
+BOTHTST(signed char, LONG64, VarI1FromI8, I1_MIN, I1_MAX)
+POSTST(signed char, ULONG64, VarI1FromUI8, I1_MAX)
 
 /* UI1 */
-BOTHTST(BYTE, SHORT, VarUI1FromI2, UI1_MIN, UI1_MAX);
-SIMPLE(BYTE, VARIANT_BOOL, VarUI1FromBool);
-NEGTST(BYTE, signed char, VarUI1FromI1);
-POSTST(BYTE, USHORT, VarUI1FromUI2, UI1_MAX);
-BOTHTST(BYTE, LONG, VarUI1FromI4, UI1_MIN, UI1_MAX);
-POSTST(BYTE, ULONG, VarUI1FromUI4, UI1_MAX);
-BOTHTST(BYTE, LONG64, VarUI1FromI8, UI1_MIN, UI1_MAX);
-POSTST(BYTE, ULONG64, VarUI1FromUI8, UI1_MAX);
+BOTHTST(BYTE, SHORT, VarUI1FromI2, UI1_MIN, UI1_MAX)
+SIMPLE(BYTE, VARIANT_BOOL, VarUI1FromBool)
+NEGTST(BYTE, signed char, VarUI1FromI1)
+POSTST(BYTE, USHORT, VarUI1FromUI2, UI1_MAX)
+BOTHTST(BYTE, LONG, VarUI1FromI4, UI1_MIN, UI1_MAX)
+POSTST(BYTE, ULONG, VarUI1FromUI4, UI1_MAX)
+BOTHTST(BYTE, LONG64, VarUI1FromI8, UI1_MIN, UI1_MAX)
+POSTST(BYTE, ULONG64, VarUI1FromUI8, UI1_MAX)
 
 /* I2 */
-SIMPLE(SHORT, BYTE, VarI2FromUI1);
-BOTHTST(SHORT, LONG, VarI2FromI4, I2_MIN, I2_MAX);
-SIMPLE(SHORT, VARIANT_BOOL, VarI2FromBool);
-SIMPLE(SHORT, signed char, VarI2FromI1);
-POSTST(SHORT, USHORT, VarI2FromUI2, I2_MAX);
-POSTST(SHORT, ULONG, VarI2FromUI4, I2_MAX);
-BOTHTST(SHORT, LONG64, VarI2FromI8, I2_MIN, I2_MAX);
-POSTST(SHORT, ULONG64, VarI2FromUI8, I2_MAX);
+SIMPLE(SHORT, BYTE, VarI2FromUI1)
+BOTHTST(SHORT, LONG, VarI2FromI4, I2_MIN, I2_MAX)
+SIMPLE(SHORT, VARIANT_BOOL, VarI2FromBool)
+SIMPLE(SHORT, signed char, VarI2FromI1)
+POSTST(SHORT, USHORT, VarI2FromUI2, I2_MAX)
+POSTST(SHORT, ULONG, VarI2FromUI4, I2_MAX)
+BOTHTST(SHORT, LONG64, VarI2FromI8, I2_MIN, I2_MAX)
+POSTST(SHORT, ULONG64, VarI2FromUI8, I2_MAX)
 
 /* UI2 */
-SIMPLE(USHORT, BYTE, VarUI2FromUI1);
-NEGTST(USHORT, SHORT, VarUI2FromI2);
-BOTHTST(USHORT, LONG, VarUI2FromI4, UI2_MIN, UI2_MAX);
-SIMPLE(USHORT, VARIANT_BOOL, VarUI2FromBool);
-NEGTST(USHORT, signed char, VarUI2FromI1);
-POSTST(USHORT, ULONG, VarUI2FromUI4, UI2_MAX);
-BOTHTST(USHORT, LONG64, VarUI2FromI8, UI2_MIN, UI2_MAX);
-POSTST(USHORT, ULONG64, VarUI2FromUI8, UI2_MAX);
+SIMPLE(USHORT, BYTE, VarUI2FromUI1)
+NEGTST(USHORT, SHORT, VarUI2FromI2)
+BOTHTST(USHORT, LONG, VarUI2FromI4, UI2_MIN, UI2_MAX)
+SIMPLE(USHORT, VARIANT_BOOL, VarUI2FromBool)
+NEGTST(USHORT, signed char, VarUI2FromI1)
+POSTST(USHORT, ULONG, VarUI2FromUI4, UI2_MAX)
+BOTHTST(USHORT, LONG64, VarUI2FromI8, UI2_MIN, UI2_MAX)
+POSTST(USHORT, ULONG64, VarUI2FromUI8, UI2_MAX)
 
 /* I4 */
-SIMPLE(LONG, BYTE, VarI4FromUI1);
-SIMPLE(LONG, SHORT, VarI4FromI2);
-SIMPLE(LONG, VARIANT_BOOL, VarI4FromBool);
-SIMPLE(LONG, signed char, VarI4FromI1);
-SIMPLE(LONG, USHORT, VarI4FromUI2);
-POSTST(LONG, ULONG, VarI4FromUI4, I4_MAX);
-BOTHTST(LONG, LONG64, VarI4FromI8, I4_MIN, I4_MAX);
-POSTST(LONG, ULONG64, VarI4FromUI8, I4_MAX);
+SIMPLE(LONG, BYTE, VarI4FromUI1)
+SIMPLE(LONG, SHORT, VarI4FromI2)
+SIMPLE(LONG, VARIANT_BOOL, VarI4FromBool)
+SIMPLE(LONG, signed char, VarI4FromI1)
+SIMPLE(LONG, USHORT, VarI4FromUI2)
+POSTST(LONG, ULONG, VarI4FromUI4, I4_MAX)
+BOTHTST(LONG, LONG64, VarI4FromI8, I4_MIN, I4_MAX)
+POSTST(LONG, ULONG64, VarI4FromUI8, I4_MAX)
 
 /* UI4 */
-SIMPLE(ULONG, BYTE, VarUI4FromUI1);
-NEGTST(ULONG, SHORT, VarUI4FromI2);
-NEGTST(ULONG, LONG, VarUI4FromI4);
-SIMPLE(ULONG, VARIANT_BOOL, VarUI4FromBool);
-NEGTST(ULONG, signed char, VarUI4FromI1);
-SIMPLE(ULONG, USHORT, VarUI4FromUI2);
-BOTHTST(ULONG, LONG64, VarUI4FromI8, UI4_MIN, UI4_MAX);
-POSTST(ULONG, ULONG64, VarUI4FromUI8, UI4_MAX);
+SIMPLE(ULONG, BYTE, VarUI4FromUI1)
+NEGTST(ULONG, SHORT, VarUI4FromI2)
+NEGTST(ULONG, LONG, VarUI4FromI4)
+SIMPLE(ULONG, VARIANT_BOOL, VarUI4FromBool)
+NEGTST(ULONG, signed char, VarUI4FromI1)
+SIMPLE(ULONG, USHORT, VarUI4FromUI2)
+BOTHTST(ULONG, LONG64, VarUI4FromI8, UI4_MIN, UI4_MAX)
+POSTST(ULONG, ULONG64, VarUI4FromUI8, UI4_MAX)
 
 /* I8 */
-SIMPLE(LONG64, BYTE, VarI8FromUI1);
-SIMPLE(LONG64, SHORT, VarI8FromI2);
-SIMPLE(LONG64, signed char, VarI8FromI1);
-SIMPLE(LONG64, USHORT, VarI8FromUI2);
-SIMPLE(LONG64, ULONG, VarI8FromUI4);
-POSTST(LONG64, ULONG64, VarI8FromUI8, I8_MAX);
+SIMPLE(LONG64, BYTE, VarI8FromUI1)
+SIMPLE(LONG64, SHORT, VarI8FromI2)
+SIMPLE(LONG64, signed char, VarI8FromI1)
+SIMPLE(LONG64, USHORT, VarI8FromUI2)
+SIMPLE(LONG64, ULONG, VarI8FromUI4)
+POSTST(LONG64, ULONG64, VarI8FromUI8, I8_MAX)
 
 /* UI8 */
-SIMPLE(ULONG64, BYTE, VarUI8FromUI1);
-NEGTST(ULONG64, SHORT, VarUI8FromI2);
-NEGTST(ULONG64, signed char, VarUI8FromI1);
-SIMPLE(ULONG64, USHORT, VarUI8FromUI2);
-SIMPLE(ULONG64, ULONG, VarUI8FromUI4);
-NEGTST(ULONG64, LONG64, VarUI8FromI8);
+SIMPLE(ULONG64, BYTE, VarUI8FromUI1)
+NEGTST(ULONG64, SHORT, VarUI8FromI2)
+NEGTST(ULONG64, signed char, VarUI8FromI1)
+SIMPLE(ULONG64, USHORT, VarUI8FromUI2)
+SIMPLE(ULONG64, ULONG, VarUI8FromUI4)
+NEGTST(ULONG64, LONG64, VarUI8FromI8)
 
 /* R4 (float) */
-SIMPLE(float, BYTE, VarR4FromUI1);
-SIMPLE(float, SHORT, VarR4FromI2);
-SIMPLE(float, signed char, VarR4FromI1);
-SIMPLE(float, USHORT, VarR4FromUI2);
-SIMPLE(float, LONG, VarR4FromI4);
-SIMPLE(float, ULONG, VarR4FromUI4);
-SIMPLE(float, LONG64, VarR4FromI8);
-SIMPLE(float, ULONG64, VarR4FromUI8);
+SIMPLE(float, BYTE, VarR4FromUI1)
+SIMPLE(float, SHORT, VarR4FromI2)
+SIMPLE(float, signed char, VarR4FromI1)
+SIMPLE(float, USHORT, VarR4FromUI2)
+SIMPLE(float, LONG, VarR4FromI4)
+SIMPLE(float, ULONG, VarR4FromUI4)
+SIMPLE(float, LONG64, VarR4FromI8)
+SIMPLE(float, ULONG64, VarR4FromUI8)
 
 /* R8 (double) */
-SIMPLE(double, BYTE, VarR8FromUI1);
-SIMPLE(double, SHORT, VarR8FromI2);
-SIMPLE(double, float, VarR8FromR4);
+SIMPLE(double, BYTE, VarR8FromUI1)
+SIMPLE(double, SHORT, VarR8FromI2)
+SIMPLE(double, float, VarR8FromR4)
 RETTYP _VarR8FromCy(CY i, double* o) { *o = (double)i.int64 / CY_MULTIPLIER_F; return S_OK; }
-SIMPLE(double, DATE, VarR8FromDate);
-SIMPLE(double, signed char, VarR8FromI1);
-SIMPLE(double, USHORT, VarR8FromUI2);
-SIMPLE(double, LONG, VarR8FromI4);
-SIMPLE(double, ULONG, VarR8FromUI4);
-SIMPLE(double, LONG64, VarR8FromI8);
-SIMPLE(double, ULONG64, VarR8FromUI8);
+SIMPLE(double, DATE, VarR8FromDate)
+SIMPLE(double, signed char, VarR8FromI1)
+SIMPLE(double, USHORT, VarR8FromUI2)
+SIMPLE(double, LONG, VarR8FromI4)
+SIMPLE(double, ULONG, VarR8FromUI4)
+SIMPLE(double, LONG64, VarR8FromI8)
+SIMPLE(double, ULONG64, VarR8FromUI8)
 
 
 /* I1