Bust our early in the macro if using the compiler for code completion.
Fixed wrong class rename.