Refactoring the triples and contexts support.