Work on trimming BBs and inseting Orets.

    This is to enable work on checking BBs for missed returns. This
    seems to be working, but is overzealous, and will error out
    when we try to call terminating functions like die().