Fixes for Rust updates

No more hacky macro module!