Clean up the Renaud->flibit diffs