patch applied (cabal-branches/cabal-1.8): Tweak layout to work with alternative layout rule