hlint: more fixes