SPARQLStore ConditionBuilder minor clean-up