Update for latest rustc (0.10-pre 74fedf3)