Applying Hlint suggestions

Mostly redundant brackets in type signatures, but in one case
implementation was changed, but in a bacwards compatible manner.