clean up control flow expressions