Not sure about that -- the comment is not about the syntax, it is about the semantic expectation of that `Future.successful(None)` indicates that there are no more records.

I'm not against changing the option syntax there if you think it's clearer, but that is not the point of the comment?