Resynch from darcs… it was a bad idea, forgive me.