Fixed Subjects => SubjectIterator refactoring leftovers