Uncommented trace-merging in step*
Changed implementation of execute-mp-tail-trace

The continuation-calling strategy was changed: it just returns a value now instead of calling a continuation from the continuation-stack.