* xfns.c (x_window): Rename locals to avoid shadowing.