Change in osmo-bsc[master]: Try to work around coverity false positives in macros