dm: avoid 'do {} while(0)' loop in single statement macros