Finished cleanup of proof-of-concept AST manipulation.