Be slightly more XBoard friendly

...hopefully without being too harsh on the user...