Fix SCM macro usage of refspec, branches