Update to build with latest rustc.

Namely:
  rustc 0.12.0-pre (06727d472 2014-08-02 02:16:02 +0000)
Merge with master.