Fix up terrible use of MemberIterator