Reworked the syntaxical concepts