patch applied (cabal-install): Rearrange dependency resolver code slightly