Xeno fixes.

See commit log.