Incorporating a few hlint suggestions.