Removed classes that are now in separate components.
Extracted FOR-AS-ARTITHMETIC-CLAUSE to a separate component.