Bugfix for make-guard-merges-cf-function

A different trace-transform-function is called: one where no remove-continuation is done or a new-state is returned, since this is already done in the mp-tail-trace that will be executed.