Changed EXPAND_WCB so it works with MSVC and GCC