Further cleanup to lazy-seq version