corrected AST-nodes according to #29. remains unreviewed until now.