Add non-const iterator finder for complex and simple types, with better naming for the existing finders.