Moved expression parsing into a new class
Added improved define() mechanism
Merge branch 'TFExpression'
Use new define() strategy