Fix macro expansion.
Refactor after Rust's serialization reform.