Refactor for ExpressionStatement and add sanity test for `for` case