Hopefully fix all the rebase-induced breakage
Hopefully fix all the rebase-induced breakage

sgillespie/ghc,sgillespie/ghc,mettekou/ghc,sgillespie/ghc,ezyang/ghc,snoyberg/ghc,ezyang/ghc,shlevy/ghc,mettekou/ghc,olsner/ghc,ezyang/ghc,shlevy/ghc,vTurbine/ghc,sdiehl/ghc,mettekou/ghc,olsner/ghc,vTurbine/ghc,mettekou/ghc,sdiehl/ghc,olsner/ghc,mettekou/ghc,shlevy/ghc,shlevy/ghc,ezyang/ghc,ezyang/ghc,shlevy/ghc,vTurbine/ghc,mettekou/ghc,vTurbine/ghc,snoyberg/ghc,snoyberg/ghc,sdiehl/ghc,snoyberg/ghc,olsner/ghc,shlevy/ghc,vTurbine/ghc,snoyberg/ghc,ezyang/ghc,sdiehl/ghc,olsner/ghc,sgillespie/ghc,olsner/ghc,snoyberg/ghc,olsner/ghc,sgillespie/ghc,sdiehl/ghc,shlevy/ghc,vTurbine/ghc,snoyberg/ghc,mettekou/ghc,vTurbine/ghc,sdiehl/ghc,sgillespie/ghc,sdiehl/ghc,ezyang/ghc,sgillespie/ghc