Update for latest rustc (0.10-pre 47ab5d2)