handle control structures better in Terminate Statement