Update for latest rustc (0.9-pre 5772401)