[common] macro abuse
[common] macro abuse
[common] macro abuse
[common] clean up