Improved logical plan.
Rename redundant ExprType names, and make LogicalPlan more robust.