Remove various patches (accepted upstream), rebase some patches.