Complete conversion to statement handling