More tidy-ups.

C++ member initializers for less repetition, make functions taking X11Env
methods of X11Env