No more segfault for expressions.
Fixed conflicts