Minor cleanups of autofoo