Sockeye: Clean up ASTs