Refactoring: moved 'remove-continuation'

This instruction is now called inside the trace, instead of after the trace has been evaluated