more ast
cleanups to anf