More transition to the generic API response handling.