diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009 Bas van Dijk
+Copyright (c) 2009-2010 Bas van Dijk
 
 All rights reserved.
 
diff --git a/Text/Repr.hs b/Text/Repr.hs
--- a/Text/Repr.hs
+++ b/Text/Repr.hs
@@ -1,8 +1,9 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE UnicodeSyntax #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP
+           , UnicodeSyntax
+           , NoImplicitPrelude
+           , OverloadedStrings
+           , ScopedTypeVariables
+  #-}
 
 module Text.Repr
     ( Repr
@@ -22,9 +23,7 @@
 --------------------------------------------------------------------------------
 
 -- from base:
-import Prelude                 ( Eq(..)
-                               , Ord(..)
-                               , Enum(..)
+import Prelude                 ( Enum(..)
                                , Bounded(..)
                                , Num(..)
                                , Real(..)
@@ -35,19 +34,22 @@
                                , RealFloat(..)
                                , undefined
                                )
+import Data.Eq                 ( Eq(..) )
+import Data.Ord                ( Ord(..) )
 import Data.String             ( IsString(..) )
 import Data.Monoid             ( Monoid(..) )
 import Data.Bits               ( Bits(..) )
 import Data.Function           ( ($) )
+import Data.Functor            ( fmap )
 import Data.Fixed              ( HasResolution(..) )
 import Data.List               ( foldr, map, zipWith, take, length )
 import Data.Int                ( Int )
 import Data.Ix                 ( Ix(..) )
 import Foreign.Storable        ( Storable(..) )
 import Foreign.Ptr             ( castPtr )
-import Data.Typeable           ( Typeable, typeOf)
+import Data.Typeable           ( Typeable(..))
 import Control.Applicative     ( liftA2 )
-import Control.Monad           ( return, (>>=), fail, fmap )
+import Control.Monad           ( return, (>>=), fail )
 import Control.Arrow           ( first )
 import Text.Show               ( Show(..) )
 import Text.Read               ( Read(..) )
@@ -69,7 +71,7 @@
 -- from string-combinators:
 import Data.String.Combinators ( (<>), (<+>)
                                , between, paren, thenParen, brackets
-                               , punctuate, fromShow, integer, int, hsep
+                               , punctuate, fromShow, integer, int, unwords
                                )
 -- from dstring:
 import Data.DString            ( DString, fromShowS, toShowS )
@@ -465,7 +467,7 @@
 applies fStr rs = fStr `apply` args rs
 
 args ∷ [Renderer] → DString
-args = hsep ∘ map (\rx → rx funAppPrec Non)
+args = unwords ∘ map (\rx → rx funAppPrec Non)
 
 list ∷ [α] → Renderer → [Repr α]
 list xs rXs = zipWith combine [0..] xs
@@ -473,7 +475,7 @@
       combine ix x = repr x $ bin L 9 "!!" rXs (\_ _ → integer ix)
 
 commas ∷ [Renderer] → DString
-commas = hsep ∘ punctuate "," ∘ map topLevel
+commas = unwords ∘ punctuate "," ∘ map topLevel
 
 unzipReprs ∷ [Repr α] → ([α], [Renderer])
 unzipReprs = foldr (\(Repr x r) ~(xs, rs) → (x:xs, r:rs)) ([], [])
diff --git a/repr.cabal b/repr.cabal
--- a/repr.cabal
+++ b/repr.cabal
@@ -1,12 +1,12 @@
 name:          repr
-version:       0.3.2
+version:       0.3.2.1
 cabal-version: >= 1.6
 build-type:    Simple
 stability:     experimental
 tested-with:   GHC ==6.10.4
 author:        Bas van Dijk
 maintainer:    v.dijk.bas@gmail.com
-copyright:     (c) 2009 Bas van Dijk
+copyright:     (c) 2009-2010 Bas van Dijk
 license:       BSD3
 license-file:  LICENSE
 category:      Numeric, Text
@@ -26,10 +26,10 @@
 
 library
   build-depends: base                 >= 3       && < 4.3
-               , base-unicode-symbols >= 0.1.1   && < 0.2
+               , base-unicode-symbols >= 0.1.1   && < 0.3
                , random               >= 1.0     && < 1.1
-               , string-combinators   == 0.4.*
+               , string-combinators   >= 0.5     && < 0.6
                , to-string-class      >= 0.1.2   && < 0.2
                , dstring              >= 0.3.0.1 && < 0.4
   exposed-modules: Text.Repr
-  ghc-options:     -Wall -O2
+  ghc-options: -Wall