Refactorred duplicate code
Removed explicite check for parenthesis from parsing of index variables (e.g. of for-stmts)