Cleanup before merging with official darcs