Clean up process_deferrals a bit