Minor refactoring in logic for iterating over clues