Update for latest rustc (0.9-pre ca54ad8)