Changes as suggested by running with "ghci -Wall".