Minor cleanup and improvements to EvidenceSourceSetController