Git'ify and clean up a few patches.