More miscellaneous AI cleanup.