#iterable-non-iterable, adapting to Beta3