Squished YamlComponent into Component, added better support for non-components.