Changed BodyPart*.ContentLocation to be a Uri and added BodyPartCollection.IndexOf(Uri)