Huge refactoring due to problem with PCL
Replace BinaryExpression with AssignmentExpression