Correct `mk` macro
Get references to boxed expressions
Update for latest Rust