Refactor ModelExpression a bit

Simplify be removing labels for operators. Operators will now be
either + or *.