Fix previous fix: properly detect CPP macros.