More request handling refactoring.