diff --git a/lib/angular_ast.dart b/lib/angular_ast.dart
index ebc6d77..c0bb973 100644
--- a/lib/angular_ast.dart
+++ b/lib/angular_ast.dart
@@ -13,8 +13,6 @@ export 'package:angular_ast/src/ast.dart'
         CloseElementAst,
         CommentAst,
         ElementAst,
-        EmbeddedContentAst,
-        EmbeddedTemplateAst,
         EventAst,
         ExpressionAst,
         InterpolationAst,
@@ -22,7 +20,6 @@ export 'package:angular_ast/src/ast.dart'
         ParsedBananaAst,
         ParsedCloseElementAst,
         ParsedDecoratorAst,
-        ParsedEmbeddedContentAst,
         ParsedEventAst,
         ParsedInterpolationAst,
         ParsedElementAst,
diff --git a/lib/src/ast.dart b/lib/src/ast.dart
index 9af8907..1b9193e 100644
--- a/lib/src/ast.dart
+++ b/lib/src/ast.dart
@@ -7,8 +7,6 @@ export 'package:angular_ast/src/ast/attribute.dart'
 export 'package:angular_ast/src/ast/close_element.dart'
     show CloseElementAst, ParsedCloseElementAst;
 export 'package:angular_ast/src/ast/comment.dart' show CommentAst;
-export 'package:angular_ast/src/ast/content.dart'
-    show EmbeddedContentAst, ParsedEmbeddedContentAst;
 export 'package:angular_ast/src/ast/element.dart'
     show ElementAst, ParsedElementAst;
 export 'package:angular_ast/src/ast/event.dart' show EventAst, ParsedEventAst;
@@ -26,7 +24,6 @@ export 'package:angular_ast/src/ast/property.dart'
     show PropertyAst, ParsedPropertyAst;
 export 'package:angular_ast/src/ast/reference.dart'
     show ReferenceAst, ParsedReferenceAst;
-export 'package:angular_ast/src/ast/template.dart' show EmbeddedTemplateAst;
 export 'package:angular_ast/src/ast/text.dart' show TextAst;
 export 'package:angular_ast/src/ast/sugar/banana.dart'
     show BananaAst, ParsedBananaAst;
diff --git a/lib/src/ast/content.dart b/lib/src/ast/content.dart
deleted file mode 100644
index f1c26da..0000000
--- a/lib/src/ast/content.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:angular_ast/src/ast.dart';
-import 'package:angular_ast/src/token/tokens.dart';
-import 'package:angular_ast/src/visitor.dart';
-import 'package:quiver/core.dart';
-import 'package:source_span/source_span.dart';
-
-/// Represents an `<ng-content>` element AST.
-///
-/// Embedded content is _like_ an `ElementAst`, but only contains children.
-///
-/// Clients should not extend, implement, or mix-in this class.
-abstract class EmbeddedContentAst implements StandaloneTemplateAst {
-  /// Create a synthetic embedded content AST.
-  factory EmbeddedContentAst([String selector]) = _SyntheticEmbeddedContentAst;
-
-  /// Create a synthetic [EmbeddedContentAst] that originated from [origin].
-  factory EmbeddedContentAst.from(
-    TemplateAst origin, [
-    String selector,
-  ]) = _SyntheticEmbeddedContentAst.from;
-
-  /// Create a new [EmbeddedContentAst] parsed from tokens in [sourceFile].
-  factory EmbeddedContentAst.parsed(
-    SourceFile sourceFile,
-    NgToken startElementToken,
-    NgToken elementIdentifierToken,
-    NgToken endElementToken,
-    CloseElementAst closeComplement, [
-    NgToken selectToken,
-    NgToken equalSign,
-    NgAttributeValueToken selectorValueToken,
-  ]) = ParsedEmbeddedContentAst;
-
-  @override
-  /*=R*/ accept/*<R, C>*/(TemplateAstVisitor/*<R, C>*/ visitor, [C context]) {
-    return visitor.visitEmbeddedContent(this, context);
-  }
-
-  /// A CSS selector denoting what elements should be embedded.
-  ///
-  /// May be null if and only if decorator 'select' is defined,
-  /// but no value is assigned.
-  /// If 'select' is not defined at all (simple <ng-content>), then the value
-  /// will default to '*'.
-  String get selector;
-
-  /// </ng-content> that is paired to this <ng-content>.
-  CloseElementAst get closeComplement;
-  set closeComplement(CloseElementAst closeComplement);
-
-  @override
-  bool operator ==(Object o) {
-    return o is EmbeddedContentAst &&
-        o.selector == selector &&
-        o.closeComplement == closeComplement;
-  }
-
-  @override
-  int get hashCode => hash2(selector.hashCode, closeComplement);
-
-  @override
-  String toString() => '$EmbeddedContentAst {$selector}';
-}
-
-class ParsedEmbeddedContentAst extends TemplateAst with EmbeddedContentAst {
-  // Token for 'ng-content'.
-  final NgToken identifierToken;
-
-  // Token for 'select'. May be null.
-  final NgToken selectToken;
-
-  // Token for '='. May be null.
-  final NgToken equalSign;
-
-  // Token for value paired to 'select'. May be null.
-  final NgAttributeValueToken selectorValueToken;
-
-  @override
-  CloseElementAst closeComplement;
-
-  ParsedEmbeddedContentAst(
-    SourceFile sourceFile,
-    NgToken startElementToken,
-    this.identifierToken,
-    NgToken endElementToken,
-    this.closeComplement, [
-    this.selectToken,
-    this.equalSign,
-    this.selectorValueToken,
-  ])
-      : super.parsed(
-          startElementToken,
-          endElementToken,
-          sourceFile,
-        );
-
-  @override
-  String get selector {
-    // '<ng-content select>' ; no value was defined.
-    // Return null to handle later.
-    if (selectToken != null && equalSign == null) {
-      return null;
-    }
-    return selectorValueToken?.innerValue?.lexeme ?? '*';
-  }
-}
-
-class _SyntheticEmbeddedContentAst extends SyntheticTemplateAst
-    with EmbeddedContentAst {
-  @override
-  final String selector;
-
-  @override
-  CloseElementAst closeComplement;
-
-  _SyntheticEmbeddedContentAst([this.selector = '*', this.closeComplement]) {
-    this.closeComplement = new CloseElementAst('ng-content');
-  }
-
-  _SyntheticEmbeddedContentAst.from(
-    TemplateAst origin, [
-    this.selector = '*',
-  ])
-      : super.from(origin) {
-    this.closeComplement = new CloseElementAst('ng-content');
-  }
-}
diff --git a/lib/src/ast/element.dart b/lib/src/ast/element.dart
index 778b6f6..aba486b 100644
--- a/lib/src/ast/element.dart
+++ b/lib/src/ast/element.dart
@@ -97,6 +97,12 @@ abstract class ElementAst implements StandaloneTemplateAst {
   /// Determines whether the element tag name is void element.
   bool get isVoidElement;
 
+  /// Determines if the element tag name is 'template'.
+  bool get isTemplate;
+
+  /// Determines if the element tag name is 'ng-content'.
+  bool get isNgContent;
+
   /// CloseElement complement
   ///
   /// If [closeComplement] == null, then [isVoidElement] is true.
@@ -238,6 +244,14 @@ class ParsedElementAst extends TemplateAst with ElementAst {
   /// Star assignments.
   @override
   final List<StarAst> stars;
+
+  /// Indicates if 'template'.
+  @override
+  bool get isTemplate => name == 'template';
+
+  /// Indicates if 'ng-content'.
+  @override
+  bool get isNgContent => name == 'ng-content';
 }
 
 class _SyntheticElementAst extends SyntheticTemplateAst with ElementAst {
@@ -296,4 +310,10 @@ class _SyntheticElementAst extends SyntheticTemplateAst with ElementAst {
 
   @override
   final List<StarAst> stars;
+
+  @override
+  bool get isTemplate => name == 'template';
+
+  @override
+  bool get isNgContent => name == 'ng-content';
 }
diff --git a/lib/src/ast/template.dart b/lib/src/ast/template.dart
deleted file mode 100644
index 62f2cbf..0000000
--- a/lib/src/ast/template.dart
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:angular_ast/src/ast.dart';
-import 'package:angular_ast/src/token/tokens.dart';
-import 'package:angular_ast/src/visitor.dart';
-import 'package:collection/collection.dart';
-import 'package:quiver/core.dart';
-import 'package:source_span/source_span.dart';
-
-const _listEquals = const ListEquality();
-
-/// Represents an embedded template (i.e. is not directly rendered in DOM).
-///
-/// It shares many properties with an [ElementAst], but is not one. It may be
-/// considered invalid to a `<template>` without any [properties] or
-/// [references].
-///
-/// Clients should not extend, implement, or mix-in this class.
-abstract class EmbeddedTemplateAst implements StandaloneTemplateAst {
-  factory EmbeddedTemplateAst({
-    List<AttributeAst> attributes,
-    List<StandaloneTemplateAst> childNodes,
-    List<EventAst> events,
-    List<PropertyAst> properties,
-    List<ReferenceAst> references,
-  }) = _SyntheticEmbeddedTemplateAst;
-
-  factory EmbeddedTemplateAst.from(
-    TemplateAst origin, {
-    List<AttributeAst> attributes,
-    List<StandaloneTemplateAst> childNodes,
-    List<EventAst> events,
-    List<PropertyAst> properties,
-    List<ReferenceAst> references,
-  }) = _SyntheticEmbeddedTemplateAst.from;
-
-  factory EmbeddedTemplateAst.parsed(
-    SourceFile sourceFile,
-    NgToken beginToken,
-    NgToken endToken, {
-    CloseElementAst closeComplement,
-    List<AttributeAst> attributes,
-    List<StandaloneTemplateAst> childNodes,
-    List<EventAst> events,
-    List<PropertyAst> properties,
-    List<ReferenceAst> references,
-  }) = _ParsedEmbeddedTemplateAst;
-
-  @override
-  /*=R*/ accept/*<R, C>*/(TemplateAstVisitor/*<R, C>*/ visitor, [C context]) {
-    return visitor.visitEmbeddedTemplate(this, context);
-  }
-
-  /// Attributes.
-  ///
-  /// Within a `<template>` tag, it may be assumed that this is a directive.
-  List<AttributeAst> get attributes;
-
-  /// Events.
-  ///
-  /// Within a `<template` tag, it may be assumed that this is a directive.
-  List<EventAst> get events;
-
-  /// Property assignments.
-  ///
-  /// For an embedded template, it may be assumed that all of this will be one
-  /// or more structural directives (i.e. like `ngForOf`), as the template
-  /// itself does not have properties.
-  List<PropertyAst> get properties;
-
-  /// References to the template.
-  ///
-  /// Unlike a reference to a DOM element, this will be a `TemplateRef`.
-  List<ReferenceAst> get references;
-
-  /// </template> that is paired to this <template>.
-  CloseElementAst get closeComplement;
-  set closeComplement(CloseElementAst closeComplement);
-
-  @override
-  bool operator ==(Object o) {
-    if (o is EmbeddedTemplateAst) {
-      return closeComplement == o.closeComplement &&
-          _listEquals.equals(attributes, o.attributes) &&
-          _listEquals.equals(events, o.events) &&
-          _listEquals.equals(properties, o.properties) &&
-          _listEquals.equals(childNodes, o.childNodes) &&
-          _listEquals.equals(references, o.references);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return hashObjects([
-      closeComplement,
-      _listEquals.hash(attributes),
-      _listEquals.hash(events),
-      _listEquals.hash(childNodes),
-      _listEquals.hash(properties),
-      _listEquals.hash(references),
-    ]);
-  }
-
-  @override
-  String toString() {
-    final buffer = new StringBuffer('$EmbeddedTemplateAst{ ');
-    if (attributes.isNotEmpty) {
-      buffer
-        ..write('attributes=')
-        ..writeAll(attributes, ', ')
-        ..write(' ');
-    }
-    if (events.isNotEmpty) {
-      buffer
-        ..write('events=')
-        ..writeAll(events, ', ')
-        ..write(' ');
-    }
-    if (properties.isNotEmpty) {
-      buffer
-        ..write('properties=')
-        ..writeAll(properties, ', ')
-        ..write(' ');
-    }
-    if (references.isNotEmpty) {
-      buffer
-        ..write('references=')
-        ..writeAll(references, ', ')
-        ..write(' ');
-    }
-    if (childNodes.isNotEmpty) {
-      buffer
-        ..write('childNodes=')
-        ..writeAll(childNodes, ', ')
-        ..write(' ');
-    }
-    if (closeComplement != null) {
-      buffer..write('closeComplement=')..write(closeComplement)..write(' ');
-    }
-    return (buffer..write('}')).toString();
-  }
-}
-
-class _ParsedEmbeddedTemplateAst extends TemplateAst with EmbeddedTemplateAst {
-  _ParsedEmbeddedTemplateAst(
-    SourceFile sourceFile,
-    NgToken beginToken,
-    NgToken endToken, {
-    this.closeComplement,
-    this.attributes: const [],
-    this.childNodes: const [],
-    this.events: const [],
-    this.properties: const [],
-    this.references: const [],
-  })
-      : super.parsed(beginToken, endToken, sourceFile);
-
-  @override
-  final List<AttributeAst> attributes;
-
-  @override
-  final List<StandaloneTemplateAst> childNodes;
-
-  @override
-  final List<EventAst> events;
-
-  @override
-  final List<PropertyAst> properties;
-
-  @override
-  final List<ReferenceAst> references;
-
-  @override
-  CloseElementAst closeComplement;
-}
-
-class _SyntheticEmbeddedTemplateAst extends SyntheticTemplateAst
-    with EmbeddedTemplateAst {
-  _SyntheticEmbeddedTemplateAst({
-    this.attributes: const [],
-    this.childNodes: const [],
-    this.events: const [],
-    this.properties: const [],
-    this.references: const [],
-  })
-      : closeComplement = new CloseElementAst('template');
-
-  _SyntheticEmbeddedTemplateAst.from(
-    TemplateAst origin, {
-    this.attributes: const [],
-    this.childNodes: const [],
-    this.events: const [],
-    this.properties: const [],
-    this.references: const [],
-  })
-      : closeComplement = new CloseElementAst('template');
-
-  @override
-  final List<AttributeAst> attributes;
-
-  @override
-  final List<StandaloneTemplateAst> childNodes;
-
-  @override
-  final List<EventAst> events;
-
-  @override
-  final List<PropertyAst> properties;
-
-  @override
-  final List<ReferenceAst> references;
-
-  @override
-  CloseElementAst closeComplement;
-}
diff --git a/lib/src/parser/recursive.dart b/lib/src/parser/recursive.dart
index 8b9a3d2..cc84504 100644
--- a/lib/src/parser/recursive.dart
+++ b/lib/src/parser/recursive.dart
@@ -250,15 +250,10 @@ class RecursiveAstParser {
   /// It's possible the element will end up not being an [ElementAst].
   StandaloneTemplateAst parseElement(
       NgToken beginToken, Queue<String> tagStack) {
-    var isTemplateElement = false;
-
     // Parse the element identifier.
     var nameToken = _reader.next();
-    if (nameToken.lexeme == 'ng-content') {
-      return parseEmbeddedContent(beginToken, nameToken);
-    } else if (nameToken.lexeme == 'template') {
-      isTemplateElement = true;
-    }
+    var isNgContent = nameToken.lexeme == 'ng-content';
+    var isTemplate = nameToken.lexeme == 'template';
     var isVoidElement = _voidElements.contains(nameToken.lexeme);
 
     // Start collecting decorators.
@@ -279,37 +274,13 @@ class RecursiveAstParser {
         if (decoratorAst is AttributeAst) {
           attributes.add(decoratorAst);
         } else if (decoratorAst is StarAst) {
-          if (isTemplateElement) {
-            exceptionHandler.handle(new AngularParserException(
-              NgParserWarningCode.INVALID_DECORATOR_IN_TEMPLATE,
-              decoratorAst.beginToken.offset,
-              decoratorAst.endToken.end - decoratorAst.beginToken.offset,
-            ));
-          } else {
-            if (stars.isNotEmpty) {
-              exceptionHandler.handle(new AngularParserException(
-                NgParserWarningCode.DUPLICATE_STAR_DIRECTIVE,
-                decoratorAst.beginToken.offset,
-                decoratorAst.endToken.end - decoratorAst.beginToken.offset,
-              ));
-            } else {
-              stars.add(decoratorAst);
-            }
-          }
+          stars.add(decoratorAst);
         } else if (decoratorAst is EventAst) {
           events.add(decoratorAst);
         } else if (decoratorAst is PropertyAst) {
           properties.add(decoratorAst);
         } else if (decoratorAst is BananaAst) {
-          if (isTemplateElement) {
-            exceptionHandler.handle(new AngularParserException(
-              NgParserWarningCode.INVALID_DECORATOR_IN_TEMPLATE,
-              decoratorAst.beginToken.offset,
-              decoratorAst.endToken.end - decoratorAst.beginToken.offset,
-            ));
-          } else {
-            bananas.add(decoratorAst);
-          }
+          bananas.add(decoratorAst);
         } else if (decoratorAst is ReferenceAst) {
           references.add(decoratorAst);
         } else {
@@ -319,6 +290,7 @@ class RecursiveAstParser {
     } while (nextToken.type != NgTokenType.openElementEnd &&
         nextToken.type != NgTokenType.openElementEndVoid);
 
+    // Determine validity of using void end.
     if (!isVoidElement && nextToken.type == NgTokenType.openElementEndVoid) {
       exceptionHandler.handle(new AngularParserException(
         NgParserWarningCode.NONVOID_ELEMENT_USING_VOID_END,
@@ -375,19 +347,9 @@ class RecursiveAstParser {
                 closeComplement.endToken.end -
                     closeComplement.beginToken.offset,
               ));
-              if (closeIdentifier == 'ng-content') {
-                var synthContent = new EmbeddedContentAst();
-                synthContent.closeComplement = closeComplement;
-                childNodes.add(synthContent);
-              } else if (closeIdentifier == 'template') {
-                var synthTemplate = new EmbeddedTemplateAst();
-                synthTemplate.closeComplement = closeComplement;
-                childNodes.add(synthTemplate);
-              } else {
-                var synthOpenElement =
-                    new ElementAst(closeNameToken.lexeme, closeComplement);
-                childNodes.add(synthOpenElement);
-              }
+              var synthOpenElement =
+                  new ElementAst(closeNameToken.lexeme, closeComplement);
+              childNodes.add(synthOpenElement);
             }
           } else {
             closeElementAst = parseCloseElement(nextToken);
@@ -401,10 +363,56 @@ class RecursiveAstParser {
       tagStack.removeFirst();
     }
 
-    if (isTemplateElement) {
-      return new EmbeddedTemplateAst.parsed(
+    if (isNgContent) {
+      if (childNodes.isNotEmpty) {
+        exceptionHandler.handle(new AngularParserException(
+          NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY,
+          beginToken.offset,
+          endToken.end - beginToken.offset,
+        ));
+      }
+      AttributeAst selectDecorator;
+      for (AttributeAst attribute in attributes) {
+        if (attribute.name == 'select') {
+          if (selectDecorator != null) {
+            _reportErrorForDecorator(
+                attribute, NgParserWarningCode.DUPLICATE_SELECT_DECORATOR);
+          } else {
+            selectDecorator = attribute;
+          }
+        } else {
+          _reportErrorForDecoratorInNgContent(attribute);
+        }
+      }
+      bananas.forEach(_reportErrorForDecoratorInNgContent);
+      events.forEach(_reportErrorForDecoratorInNgContent);
+      properties.forEach(_reportErrorForDecoratorInNgContent);
+      references.forEach(_reportErrorForDecoratorInNgContent);
+      stars.forEach(_reportErrorForDecoratorInNgContent);
+
+      return new ElementAst.parsed(
         _source,
         beginToken,
+        nameToken,
+        endToken,
+        attributes: (selectDecorator == null ? [] : [selectDecorator]),
+        childNodes: childNodes,
+        closeComplement: closeElementAst,
+      );
+    }
+    if (isTemplate) {
+      stars.forEach((star) {
+        _reportErrorForDecorator(
+            star, NgParserWarningCode.INVALID_DECORATOR_IN_TEMPLATE);
+      });
+      bananas.forEach((banana) {
+        _reportErrorForDecorator(
+            banana, NgParserWarningCode.INVALID_DECORATOR_IN_TEMPLATE);
+      });
+      return new ElementAst.parsed(
+        _source,
+        beginToken,
+        nameToken,
         endToken,
         closeComplement: closeElementAst,
         attributes: attributes,
@@ -414,6 +422,16 @@ class RecursiveAstParser {
         references: references,
       );
     } else {
+      StarAst uniqueStarAst;
+      for (StarAst star in stars) {
+        if (uniqueStarAst == null) {
+          uniqueStarAst = star;
+        } else {
+          _reportErrorForDecorator(
+              star, NgParserWarningCode.DUPLICATE_STAR_DIRECTIVE);
+        }
+      }
+
       return new ElementAst.parsed(
         _source,
         beginToken,
@@ -425,136 +443,23 @@ class RecursiveAstParser {
         properties: properties,
         references: references,
         bananas: bananas,
-        stars: stars,
+        stars: (uniqueStarAst == null ? [] : [uniqueStarAst]),
         closeComplement: closeElementAst,
       );
     }
   }
 
-  /// Returns and parses an embedded content directive/transclusions.
-  EmbeddedContentAst parseEmbeddedContent(
-      NgToken beginToken, NgToken elementIdentifierToken) {
-    NgToken selectToken, equalSign, endToken;
-    NgAttributeValueToken valueToken;
-    var selectAttributeFound = false;
-    CloseElementAst closeElementAst;
-
-    // Ensure that ng-content has only 'select' attribute, if any. Also
-    // catch for multiple 'select'; if multiple, accept the first one seen.
-    while (_reader.peekType() == NgTokenType.beforeElementDecorator) {
-      var startOffset = _reader.next().offset;
-      var nextToken = _reader.next();
-
-      if (nextToken.type != NgTokenType.elementDecorator ||
-          nextToken.lexeme != 'select') {
-        var endOffset = _accumulateInvalidNgContentDecoratorValue(nextToken);
-        var e = new AngularParserException(
-          NgParserWarningCode.INVALID_DECORATOR_IN_NGCONTENT,
-          startOffset,
-          endOffset - startOffset,
-        );
-        exceptionHandler.handle(e);
-      } else {
-        if (selectAttributeFound) {
-          var endOffset = _accumulateInvalidNgContentDecoratorValue(nextToken);
-          var e = new AngularParserException(
-            NgParserWarningCode.DUPLICATE_SELECT_DECORATOR,
-            startOffset,
-            endOffset - startOffset,
-          );
-          exceptionHandler.handle(e);
-        } else {
-          selectAttributeFound = true;
-          selectToken = nextToken;
-          _consumeWhitespaces();
-          if (_reader.peekType() == NgTokenType.beforeElementDecoratorValue) {
-            equalSign = _reader.next();
-            _consumeWhitespaces();
-            valueToken = _reader.next();
-          }
-        }
-      }
-    }
-
-    _consumeWhitespaces();
-
-    // Ensure closed by '>' and not '/>'.
-    endToken = _reader.next();
-    if (endToken.type == NgTokenType.openElementEndVoid) {
-      var e = new AngularParserException(
-        NgParserWarningCode.NONVOID_ELEMENT_USING_VOID_END,
-        endToken.offset,
-        endToken.length,
-      );
-      exceptionHandler.handle(e);
-      endToken = new NgToken.generateErrorSynthetic(
-        endToken.offset,
-        NgTokenType.openElementEnd,
-      );
-    }
-
-    // Ensure closing </ng-content> exists.
-    if (_reader.peekType() != NgTokenType.closeElementStart) {
-      var e = new AngularParserException(
-        NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY,
-        beginToken.offset,
-        endToken.end - beginToken.offset,
-      );
-      exceptionHandler.handle(e);
-      closeElementAst = new CloseElementAst('ng-content');
-    } else {
-      var closeElementStart = _reader.next();
-      var closeElementName = _reader.peek().lexeme;
-
-      if (closeElementName != 'ng-content') {
-        var e = new AngularParserException(
-          NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY,
-          beginToken.offset,
-          endToken.end - beginToken.offset,
-        );
-        exceptionHandler.handle(e);
-        _reader.putBack(closeElementStart);
-        closeElementAst = new CloseElementAst('ng-content');
-      } else {
-        closeElementAst = parseCloseElement(closeElementStart);
-      }
-    }
-    return new EmbeddedContentAst.parsed(
-      _source,
-      beginToken,
-      elementIdentifierToken,
-      endToken,
-      closeElementAst,
-      selectToken,
-      equalSign,
-      valueToken,
-    );
+  void _reportErrorForDecorator(
+      TemplateAst decorator, NgParserWarningCode code) {
+    exceptionHandler.handle(new AngularParserException(
+        code,
+        decorator.beginToken.offset,
+        decorator.endToken.end - decorator.beginToken.offset));
   }
 
-  /// Helper function that accumulates all parts of attribute-value variant
-  /// and returns the end offset at where it finishes. Should be used to gather
-  /// any non-'select' decorator. Consumes all necessary erroneous tokens.
-  int _accumulateInvalidNgContentDecoratorValue(NgToken nextToken) {
-    NgToken lastConsumedToken;
-    if (nextToken.type == NgTokenType.bananaPrefix ||
-        nextToken.type == NgTokenType.eventPrefix ||
-        nextToken.type == NgTokenType.propertyPrefix) {
-      lastConsumedToken = _reader.next(); // Decorator
-      lastConsumedToken = _reader.next(); // Suffix
-    } else if (nextToken.type == NgTokenType.templatePrefix ||
-        nextToken.type == NgTokenType.referencePrefix) {
-      lastConsumedToken = _reader.next(); // Decorator
-    }
-    if (_reader.peekTypeIgnoringType(NgTokenType.whitespace) ==
-        NgTokenType.beforeElementDecoratorValue) {
-      _consumeWhitespaces();
-      if (_reader.peekType() == NgTokenType.beforeElementDecoratorValue) {
-        lastConsumedToken = _reader.next(); // '=' sign
-      }
-      _consumeWhitespaces();
-      lastConsumedToken = _reader.next(); // Attribute value
-    }
-    return lastConsumedToken?.end ?? nextToken.end;
+  void _reportErrorForDecoratorInNgContent(TemplateAst decorator) {
+    _reportErrorForDecorator(
+        decorator, NgParserWarningCode.INVALID_DECORATOR_IN_NGCONTENT);
   }
 
   /// Returns and parses an interpolation AST.
@@ -595,15 +500,9 @@ class RecursiveAstParser {
           closeComplement.beginToken.offset,
           closeComplement.endToken.end - closeComplement.beginToken.offset,
         ));
-        if (danglingCloseIdentifier == 'ng-content') {
-          var synthOpenElement = new EmbeddedContentAst();
-          synthOpenElement.closeComplement = closeComplement;
-          return synthOpenElement;
-        } else {
-          var synthOpenElement =
-              new ElementAst(danglingCloseIdentifier, closeComplement);
-          return synthOpenElement;
-        }
+        var synthOpenElement =
+            new ElementAst(danglingCloseIdentifier, closeComplement);
+        return synthOpenElement;
         break;
       default:
         // Simply throw error here; should never hit.
diff --git a/lib/src/visitor.dart b/lib/src/visitor.dart
index 0e3a706..9477360 100644
--- a/lib/src/visitor.dart
+++ b/lib/src/visitor.dart
@@ -28,27 +28,16 @@ abstract class TemplateAstVisitor<R, C> {
   /// Visits all comment ASTs.
   R visitComment(CommentAst astNode, [C context]);
 
-  /// Visits all embedded content ASTs.
-  R visitEmbeddedContent(EmbeddedContentAst astNode, [C context]);
-
-  /// Visits all embedded template ASTs.
-  R visitEmbeddedTemplate(EmbeddedTemplateAst astNode, [C context]) {
-    astNode
-      ..attributes.forEach((a) => visitAttribute(a, context))
-      ..childNodes.forEach((c) => c.accept/*<R, C>*/(this, context))
-      ..properties.forEach((p) => visitProperty(p, context))
-      ..references.forEach((r) => visitReference(r, context));
-    return null;
-  }
-
   /// Visits all element ASTs.
   R visitElement(ElementAst astNode, [C context]) {
     astNode
       ..attributes.forEach((a) => visitAttribute(a, context))
+      ..bananas.forEach((b) => visitBanana(b, context))
       ..childNodes.forEach((c) => c.accept/*<R, C>*/(this, context))
       ..events.forEach((e) => visitEvent(e, context))
       ..properties.forEach((p) => visitProperty(p, context))
-      ..references.forEach((r) => visitReference(r, context));
+      ..references.forEach((r) => visitReference(r, context))
+      ..stars.forEach((s) => visitStar(s, context));
     return null;
   }
 
diff --git a/lib/src/visitors/desugar_visitor.dart b/lib/src/visitors/desugar_visitor.dart
index 3ee43fd..24f7ea3 100644
--- a/lib/src/visitors/desugar_visitor.dart
+++ b/lib/src/visitors/desugar_visitor.dart
@@ -58,6 +58,10 @@ class DesugarVisitor implements TemplateAstVisitor<TemplateAst, String> {
 
   @override
   TemplateAst visitElement(ElementAst astNode, [_]) {
+    if (astNode.isTemplate || astNode.isNgContent) {
+      return astNode;
+    }
+
     var newChildren = <StandaloneTemplateAst>[];
     astNode.childNodes.forEach((child) {
       newChildren.add(child.accept(this) as StandaloneTemplateAst);
@@ -83,7 +87,7 @@ class DesugarVisitor implements TemplateAstVisitor<TemplateAst, String> {
       var expressionOffset =
           (starAst as ParsedStarAst).valueToken.innerValue.offset;
       var directiveName = starAst.name;
-      EmbeddedTemplateAst newAst;
+      ElementAst newAst;
       var propertiesToAdd = <PropertyAst>[];
       var referencesToAdd = <ReferenceAst>[];
 
@@ -105,8 +109,10 @@ class DesugarVisitor implements TemplateAstVisitor<TemplateAst, String> {
           referencesToAdd.addAll(micro.assignments);
         }
 
-        newAst = new EmbeddedTemplateAst.from(
+        newAst = new ElementAst.from(
           origin,
+          'template',
+          new CloseElementAst('template'),
           childNodes: [
             astNode,
           ],
@@ -121,8 +127,10 @@ class DesugarVisitor implements TemplateAstVisitor<TemplateAst, String> {
           directiveName,
           starExpression,
         ));
-        newAst = new EmbeddedTemplateAst.from(
+        newAst = new ElementAst.from(
           origin,
+          'template',
+          new CloseElementAst('template'),
           childNodes: [
             astNode,
           ],
@@ -137,13 +145,6 @@ class DesugarVisitor implements TemplateAstVisitor<TemplateAst, String> {
     return astNode;
   }
 
-  @override
-  TemplateAst visitEmbeddedContent(EmbeddedContentAst astNode, [_]) => astNode;
-
-  @override
-  TemplateAst visitEmbeddedTemplate(EmbeddedTemplateAst astNode, [_]) =>
-      astNode;
-
   @override
   TemplateAst visitEvent(EventAst astNode, [_]) => astNode;
 
diff --git a/lib/src/visitors/expression_parser_visitor.dart b/lib/src/visitors/expression_parser_visitor.dart
index 3f95275..1a70940 100644
--- a/lib/src/visitors/expression_parser_visitor.dart
+++ b/lib/src/visitors/expression_parser_visitor.dart
@@ -26,23 +26,6 @@ class ExpressionParserVisitor<C> implements TemplateAstVisitor<Null, C> {
   @override
   visitComment(CommentAst astNode, [_]) => null;
 
-  @override
-  visitEmbeddedContent(EmbeddedContentAst astNode, [_]) => null;
-
-  @override
-  visitEmbeddedTemplate(EmbeddedTemplateAst astNode, [_]) {
-    astNode.events.forEach((event) {
-      event.accept(this);
-    });
-    astNode.properties.forEach((property) {
-      property.accept(this);
-    });
-    astNode.childNodes.forEach((child) {
-      child.accept(this);
-    });
-    return null;
-  }
-
   @override
   visitElement(ElementAst astNode, [_]) {
     astNode.events.forEach((event) {
diff --git a/lib/src/visitors/humanizing.dart b/lib/src/visitors/humanizing.dart
index 4a99690..e09fcf2 100644
--- a/lib/src/visitors/humanizing.dart
+++ b/lib/src/visitors/humanizing.dart
@@ -90,51 +90,6 @@ class HumanizingTemplateAstVisitor
     return context.toString();
   }
 
-  @override
-  String visitEmbeddedContent(
-    EmbeddedContentAst astNode, [
-    StringBuffer context,
-  ]) {
-    context ??= new StringBuffer();
-    if (astNode.selector != null) {
-      context.write('<ng-content select="${astNode.selector}">');
-    } else {
-      context.write('<ng-content>');
-    }
-    context.write('</ng-content>');
-    return context.toString();
-  }
-
-  @override
-  String visitEmbeddedTemplate(
-    EmbeddedTemplateAst astNode, [
-    StringBuffer context,
-  ]) {
-    context ??= new StringBuffer();
-    context..write('<template');
-    if (astNode.attributes.isNotEmpty) {
-      context
-        ..write(' ')
-        ..writeAll(astNode.attributes.map(visitAttribute), ' ');
-    }
-    if (astNode.properties.isNotEmpty) {
-      context
-        ..write(' ')
-        ..writeAll(astNode.properties.map(visitProperty), ' ');
-    }
-    if (astNode.references.isNotEmpty) {
-      context
-        ..write(' ')
-        ..writeAll(astNode.references.map(visitReference), ' ');
-    }
-    context.write('>');
-    if (astNode.childNodes.isNotEmpty) {
-      context.writeAll(astNode.childNodes.map((c) => c.accept(this)));
-    }
-    context..write('</template>');
-    return context.toString();
-  }
-
   @override
   String visitEvent(EventAst astNode, [StringBuffer context]) {
     context ??= new StringBuffer();
diff --git a/lib/src/visitors/identity.dart b/lib/src/visitors/identity.dart
index c7fc6ec..3933d82 100644
--- a/lib/src/visitors/identity.dart
+++ b/lib/src/visitors/identity.dart
@@ -24,13 +24,6 @@ class IdentityTemplateAstVisitor<C>
   @override
   TemplateAst visitComment(CommentAst astNode, [_]) => astNode;
 
-  @override
-  TemplateAst visitEmbeddedContent(EmbeddedContentAst astNode, [_]) => astNode;
-
-  @override
-  TemplateAst visitEmbeddedTemplate(EmbeddedTemplateAst astNode, [_]) =>
-      astNode;
-
   @override
   TemplateAst visitElement(ElementAst astNode, [_]) => astNode;
 
diff --git a/test/parser_test.dart b/test/parser_test.dart
index 3cd7e97..9467beb 100644
--- a/test/parser_test.dart
+++ b/test/parser_test.dart
@@ -255,7 +255,7 @@ void main() {
     expect(
       parse('<ng-content></ng-content>'),
       [
-        new EmbeddedContentAst(),
+        new ElementAst('ng-content', new CloseElementAst('ng-content')),
       ],
     );
   });
@@ -264,7 +264,13 @@ void main() {
     expect(
       parse('<ng-content select="tab"></ng-content>'),
       [
-        new EmbeddedContentAst('tab'),
+        new ElementAst(
+          'ng-content',
+          new CloseElementAst('ng-content'),
+          attributes: [
+            new AttributeAst('select', 'tab'),
+          ],
+        )
       ],
     );
   });
@@ -273,7 +279,7 @@ void main() {
     expect(
       parse('<template></template>'),
       [
-        new EmbeddedTemplateAst(),
+        new ElementAst('template', new CloseElementAst('template')),
       ],
     );
   });
@@ -282,7 +288,9 @@ void main() {
     expect(
       parse('<template ngFor let-item let-i="index"></template>'),
       [
-        new EmbeddedTemplateAst(
+        new ElementAst(
+          'template',
+          new CloseElementAst('template'),
           attributes: [
             new AttributeAst('ngFor'),
             new AttributeAst('let-item'),
@@ -298,20 +306,22 @@ void main() {
       parse(
           '<template step name="Name & Description" (jumpHere)="lastStep(false)"></template>'),
       [
-        new EmbeddedTemplateAst(attributes: [
-          new AttributeAst('step'),
-          new AttributeAst('name', 'Name & Description'),
-        ], events: [
-          new EventAst(
-            'jumpHere',
-            'lastStep(false)',
-            new ExpressionAst.parse(
-              'lastStep(false)',
-              53,
-              sourceUrl: '/test/expression/parser_test.dart#inline',
-            ),
-          ),
-        ]),
+        new ElementAst('template', new CloseElementAst('template'),
+            attributes: [
+              new AttributeAst('step'),
+              new AttributeAst('name', 'Name & Description'),
+            ],
+            events: [
+              new EventAst(
+                'jumpHere',
+                'lastStep(false)',
+                new ExpressionAst.parse(
+                  'lastStep(false)',
+                  53,
+                  sourceUrl: '/test/expression/parser_test.dart#inline',
+                ),
+              ),
+            ]),
       ],
     );
   });
@@ -320,7 +330,9 @@ void main() {
     expect(
       parse('<template [ngIf]="someValue"></template>'),
       [
-        new EmbeddedTemplateAst(
+        new ElementAst(
+          'template',
+          new CloseElementAst('template'),
           properties: [
             new PropertyAst(
                 'ngIf',
@@ -340,7 +352,9 @@ void main() {
     expect(
       parse('<template #named ></template>'),
       [
-        new EmbeddedTemplateAst(
+        new ElementAst(
+          'template',
+          new CloseElementAst('template'),
           references: [
             new ReferenceAst('named'),
           ],
@@ -353,7 +367,9 @@ void main() {
     expect(
       parse('<template>Hello World</template>'),
       [
-        new EmbeddedTemplateAst(
+        new ElementAst(
+          'template',
+          new CloseElementAst('template'),
           childNodes: [
             new TextAst('Hello World'),
           ],
@@ -423,7 +439,9 @@ void main() {
     expect(
       parse('<a *ngFor="let item of items; trackBy: byId; let i = index"></a>'),
       [
-        new EmbeddedTemplateAst(
+        new ElementAst(
+          'template',
+          new CloseElementAst('template'),
           attributes: [
             new AttributeAst('ngFor'),
           ],
@@ -510,7 +528,9 @@ void main() {
     var templateString = '''
 <div *ngFor="let x of items.where(filter)"></div>''';
     expect(parse(templateString), [
-      new EmbeddedTemplateAst(
+      new ElementAst(
+        'template',
+        new CloseElementAst('template'),
         attributes: [
           new AttributeAst('ngFor'),
         ],
diff --git a/test/recover_errors_parser.dart b/test/recover_errors_parser.dart
index 0a5d505..424b680 100644
--- a/test/recover_errors_parser.dart
+++ b/test/recover_errors_parser.dart
@@ -161,14 +161,14 @@ void main() {
     expect(div.childNodes.length, 1);
 
     var ngContent = div.childNodes[0];
-    expect(ngContent, new isInstanceOf<EmbeddedContentAst>());
+    expect(ngContent, new isInstanceOf<ElementAst>());
     expect(ngContent.isSynthetic, false);
-    expect((ngContent as EmbeddedContentAst).closeComplement.isSynthetic, true);
+    expect((ngContent as ElementAst).closeComplement.isSynthetic, true);
+    expect((ngContent as ElementAst).isNgContent, true);
 
-    expect(
-        astsToString(asts), '<div><ng-content select="*"></ng-content></div>');
+    expect(astsToString(asts), '<div><ng-content></ng-content></div>');
 
-    checkException(NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY, 5, 12);
+    checkException(NgParserWarningCode.CANNOT_FIND_MATCHING_CLOSE, 5, 12);
   });
 
   test('Should resolve dangling close ng-content', () {
@@ -179,55 +179,36 @@ void main() {
     expect(div.childNodes.length, 1);
 
     var ngContent = div.childNodes[0];
-    expect(ngContent, new isInstanceOf<EmbeddedContentAst>());
+    expect(ngContent, new isInstanceOf<ElementAst>());
     expect(ngContent.isSynthetic, true);
-    expect(
-        (ngContent as EmbeddedContentAst).closeComplement.isSynthetic, false);
-    expect(
-        astsToString(asts), '<div><ng-content select="*"></ng-content></div>');
+    expect((ngContent as ElementAst).isNgContent, true);
+    expect((ngContent as ElementAst).closeComplement.isSynthetic, false);
+    expect(astsToString(asts), '<div><ng-content></ng-content></div>');
 
     checkException(NgParserWarningCode.DANGLING_CLOSE_ELEMENT, 5, 13);
   });
 
   test('Should resolve ng-content with children', () {
     var asts = parse('<ng-content><div></div></ng-content>');
-    expect(asts.length, 3);
+    expect(asts.length, 1);
 
-    var ngcontent1 = asts[0];
-    var div = asts[1];
-    var ngcontent2 = asts[2];
+    var ngcontent = asts[0];
 
-    expect(ngcontent1.childNodes.length, 0);
+    expect(ngcontent.childNodes.length, 1);
+    var div = ngcontent.childNodes[0] as ParsedElementAst;
+    expect(div.name, 'div');
     expect(div.childNodes.length, 0);
-    expect(ngcontent2.childNodes.length, 0);
 
-    expect(ngcontent1, new isInstanceOf<EmbeddedContentAst>());
-    expect(div, new isInstanceOf<ElementAst>());
-    expect(ngcontent2, new isInstanceOf<EmbeddedContentAst>());
-
-    expect(ngcontent1.isSynthetic, false);
-    expect(
-        (ngcontent1 as EmbeddedContentAst).closeComplement.isSynthetic, true);
-
-    expect(ngcontent2.isSynthetic, true);
-    expect(
-        (ngcontent2 as EmbeddedContentAst).closeComplement.isSynthetic, false);
-
-    expect(astsToString(asts),
-        '<ng-content select="*"></ng-content><div></div><ng-content select="*"></ng-content>');
+    expect(ngcontent.isSynthetic, false);
+    expect((ngcontent as ElementAst).closeComplement.isSynthetic, false);
 
     var exceptions = recoveringExceptionHandler.exceptions;
-    expect(exceptions.length, 2);
-
-    var e1 = exceptions[0];
-    expect(e1.errorCode, NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY);
-    expect(e1.offset, 0);
-    expect(e1.length, 12);
+    expect(exceptions.length, 1);
 
-    var e2 = exceptions[1];
-    expect(e2.errorCode, NgParserWarningCode.DANGLING_CLOSE_ELEMENT);
-    expect(e2.offset, 23);
-    expect(e2.length, 13);
+    var e = exceptions[0];
+    expect(e.errorCode, NgParserWarningCode.NGCONTENT_MUST_CLOSE_IMMEDIATELY);
+    expect(e.offset, 0);
+    expect(e.length, 12);
   });
 
   test('Should handle ng-content used with void end', () {
@@ -235,8 +216,8 @@ void main() {
     expect(asts.length, 1);
 
     var ngContent = asts[0];
-    expect(ngContent, new isInstanceOf<EmbeddedContentAst>());
-    expect(astsToString(asts), '<ng-content select="*"></ng-content>');
+    expect(ngContent, new isInstanceOf<ElementAst>());
+    expect(astsToString(asts), '<ng-content></ng-content>');
 
     checkException(NgParserWarningCode.NONVOID_ELEMENT_USING_VOID_END, 11, 2);
   });
@@ -250,9 +231,9 @@ void main() {
     expect(div.childNodes.length, 1);
 
     var template = div.childNodes[0];
-    expect(template, new isInstanceOf<EmbeddedTemplateAst>());
+    expect(template, new isInstanceOf<ElementAst>());
     expect(template.isSynthetic, false);
-    expect((template as EmbeddedTemplateAst).closeComplement.isSynthetic, true);
+    expect((template as ElementAst).closeComplement.isSynthetic, true);
 
     expect(
         astsToString(asts),
@@ -270,10 +251,9 @@ void main() {
     expect(div.childNodes.length, 1);
 
     var template = div.childNodes[0];
-    expect(template, new isInstanceOf<EmbeddedTemplateAst>());
+    expect(template, new isInstanceOf<ElementAst>());
     expect(template.isSynthetic, true);
-    expect(
-        (template as EmbeddedTemplateAst).closeComplement.isSynthetic, false);
+    expect((template as ElementAst).closeComplement.isSynthetic, false);
     expect(astsToString(asts), '<div><template></template></div>');
 
     checkException(NgParserWarningCode.DANGLING_CLOSE_ELEMENT, 5, 11);
@@ -285,7 +265,7 @@ void main() {
     expect(asts.length, 1);
 
     var ngContent = asts[0];
-    expect(ngContent, new isInstanceOf<EmbeddedTemplateAst>());
+    expect(ngContent, new isInstanceOf<ElementAst>());
     expect(
         astsToString(asts),
         '<template ngFor let-item let-i="index"'
@@ -300,8 +280,11 @@ void main() {
     var asts = parse(html);
     expect(asts.length, 1);
 
-    var ngcontent = asts[0] as EmbeddedContentAst;
-    expect(ngcontent.selector, '*');
+    var ngcontent = asts[0] as ElementAst;
+    expect(ngcontent.attributes.length, 1);
+    var selectAttr = ngcontent.attributes[0] as ParsedAttributeAst;
+    expect(selectAttr.name, 'select');
+    expect(selectAttr.value, '*');
 
     var exceptions = recoveringExceptionHandler.exceptions;
     expect(exceptions.length, 3);
@@ -327,8 +310,12 @@ void main() {
     var asts = parse(html);
     expect(asts.length, 1);
 
-    var ngcontent = asts[0] as EmbeddedContentAst;
-    expect(ngcontent.selector, '*');
+    var ngcontent = asts[0] as ElementAst;
+    expect(ngcontent.attributes.length, 1);
+    var firstSelectAttr = ngcontent.attributes[0] as ParsedAttributeAst;
+    expect(firstSelectAttr.name, 'select');
+    expect(firstSelectAttr.value, '*');
+    expect(firstSelectAttr.nameToken.offset, 12);
 
     checkException(NgParserWarningCode.DUPLICATE_SELECT_DECORATOR, 24, 21);
   });
@@ -386,9 +373,9 @@ void main() {
     var asts =
         parse('<div *ngFor="["></div>', desugar: true, parseExpression: true);
     expect(asts.length, 1);
-    expect(asts[0], new isInstanceOf<EmbeddedTemplateAst>());
+    expect(asts[0], new isInstanceOf<ElementAst>());
 
-    var template = asts[0] as EmbeddedTemplateAst;
+    var template = asts[0] as ElementAst;
     expect(template.properties.length, 1);
     expect(template.properties[0].expression, null);