Make sniff_request_type use single return point