In the lambda we are now returning the remark by value so we need to preserve
its type in the insertion operator. This requires making the insertion
I've also converted a few cases to use the new API. It seems to work pretty
well. See the LoopUnroller for a slightly more interesting case.