We now use SpelQueryContext and SpelExtractor for analysis and rewrite of queries using SpEL. Original pull request: #376.