Updated macros to new rust plugin framework

This fixes recent compilation failures in master.