Fix up X clipboard support, partially.