Reduce warnings.
Merge branch 'rust-servo' into rust-0.9: Rebasing
Revert "Merge branch 'rust-servo' into rust-0.9: Rebasing"

This reverts commit 8c3009faa0a27caaef9306e221b12e6e69d17263, reversing
changes made to 4a4a4dd2b72275983b7a40402ece6034c0e6a531.
Reduce more warnings.
Reduce more warnings.