Big cleanup wrt AstBuilder and ProtoAst gen