macros: some cleanup.