More rewriting of AI transfer procs/etc.