And then how to do the cleanups properly? I would not mix C and C++ code styles, and here I have to deal with C code. Either I expand all, making it much bigger and less readable, or I keep the macros (still better than goto's).