Fixes for Rust RFC #390.