Completed third level of issues during migration to Rust v0.7.