Shuffle more stuff between proto-specific and generic fetch code.