Redundancy cleanup, now compiles without any warnings under ghc -Wall.