Minor hlint based cleanup.