Yeah, finding the upstream branch name is the difficult bit :-(  I don't know how to do it without an interface redesign.