Deals with macro name clashes, and also better enacapsulates unfortunate dep on SC internals, as well as improving build times