Remove debugger-name and cmd-args fields from srcbuf. If you need it, get it from the command buffer.