Fix for changes to macro syntax in latest Rust