Refactored vec and str iterators to remove prefixes

Resolves #8093