Tiny cleanups to x11.c.