use actual flint sparql grammar now, instead of slightly modified own version