Revert "Revert "Hlint cleanup""

This reverts commit e8d488859c23c9a33b2dec786bfa96e3137b1284.