patch applied (cabal): Rearrange PackageDescription some more