Make maximal use of the remote refs