Accepting an Hlint suggestion.
Whitespace changes.
Minor code tidying of main.
A few simple makefile tweaks.