Continued refactoring on the fetch session.