Simplify test::decorate_iterator