Fixed some more instances of return with a value inside of a generator