Only call pop-trace-node-frame-from-stack! in a guard-failure if the guard-trace doesn't loop

Also move this instruction into the trace itself, instead of outside it, in execute-guard-trace