Redo edit to expand trace coverage. This passes 'hello world' on x32.