Big refactoring. Redesign type of RawExpr, simplify code.