apply: refactor "previous patch" logic