reactive macros: refactored macro implementation=