Some hlint fixes.