Good point, that makes it so much simpler. (We need to look for -CXephyr as well, though)