Fix macros for rust nightly