macros: cleanup macros to simplify dependencies.