Some more refactoring to LoopingEvidenceSource