Deal with current_head being a substring of resolved_ref