Continued refactoring of the request queueing classes.