Fix up more hlint warnings
More hlint fixups