Use new macros in common.h.