Fix compilation on Rust nightly.
WIP changes (doesn't compile)