Xenoarch tweaks

See commit log for details.