Treats absence of XSource configuration as exception
Remove cruft, harden version spec in prefstore