Some hlint-assisted cleanup.