Improved `EXPECT` macro to handle commas properly.