Improve on previous change in xdisp.c.