Add lots of defensive kid-AST cleanup
TODOne
AST: reverse