Prioritize "scm" over "cvs". This was underspecified before.