Need to commit so I can regen on the laptop.  It's too big a job for
my creaky old Linux box to regen XMsg on it in any sane amount of time.