xla

3be22fed - Even more cleanups from review feedback