Switch back to clearer iterator-based wrap()