Tightened up selection of repo type