Push the refactoring through the CLike IR.  Also, need to change ProgResults to account for tuple unzipping.