Fix rework-vars error by using new syntax