More complete handling of remote sources.