Support IF and WHILE statements, refactor StatementGroup