Fix line number reporting for while loop tests.
Merge from upstream.
Merge remote-tracking branch 'upstream/master'
Fix set == and !=.