Partial cleanup using hlint.