Fix some problems in vector expressions. But did cause new problems: too complex expressions and incorrect variable selection.