Moving common code up in fetcher code. Preparing for metadata lazy-checking