Use universal diagnostic macros