Improved handling of ETags and non-RDF resources.