Cleaner fix for OperationIterable looping logic

JAVA-1546