Fixed some assertions in the QueryExpressionExpander that failed because...

... a parser bug was fixed.