Cleanup code: step 1: fix warnings.
Fix build for Rust master.