Refactoring AST - phase 2

Some simplification and clarification of responsibilities between AST classes can be useful to reduce the size of the code base and the code duplication, as well as can result in a clearer code.