Don't add empty domain strings to DomainSet.
Fix some lint errors.