I do really doubt the current implementation of Code-Completion does any kind of macro-replacement. The good news is that I'm finishing my preprocessor implementation, so it could possibly, just possibly, be used to 'complement' that plugin in the meanwhile.