Add separate class of macros for Remora code and a macro that expands them