Intermediate commit towards more Sparql features.