Renamed macro to be more accurate.
Switched to a better solution for quieting the static analyzer.