Move most iter functionality to extra, fixes #7343