Refactoring to merge evidence into a single iterator