Hlint the sources.

Incorporates some hlint suggestions.