Make x11 option build (though it runs unreliably!).
Cleanups suggested by pkglint.