AST: Ooops, forgot file in prev commit

Also updates some todos.