Branch v2 dry stuff

Ok, I agree! It makes sense to move the `.repository?` calls somewhere else.