* Get rid of 'index' lines in patches, which are unnecessary and likely wrong anyway (esp. when there are multiple patches) * Simplify patches to remove unnecessary context and make them more robust