Add generic control flow expander