Enhance helper macros and apply everywhere.