A few hlint suggestions