More hlint fixups