Enabled GenericTokens for AdditionSubtraction and LesserGreater expressions
Closes #224. Reimplemented th:remove based on Standard Expressions for greater flexibility