 
 	/**
 	 *  @private
-	 *  Adds the TextLines created by composeTextLines()
-     *  to a specified DisplayObjectContainer.
+	 *  Adds the TextLines created by composeTextLines() to this container.
 	 */
-	mx_internal function addTextLines(container:DisplayObjectContainer,
-								      index:int = 0):void
+	mx_internal function addTextLines(index:int = 0):void
 	{
 		var n:int = textLines.length;
         if (n == 0)
             return;
 
-        var addChildAtMethod:Function = container is UIComponent ?
-        								UIComponent(container).$addChildAt :
-        								container.addChildAt;
-            
         for (var i:int = n - 1; i >= 0; i--)
-		{
-			var textLine:DisplayObject = textLines[i];
-						
-            //trace(container.name, "addTextLines", textLine.x, textLine.y, drawX, drawY);
-            
-			addChildAtMethod(textLine, index);
-		}
+        {
+            var textLine:DisplayObject = textLines[i];			
+            $addChildAt(textLine, index);
+        }
 	}
 
 	/**

    /**
     *  @private
     */
    private function composeOnHeightChange(unscaledHeight:Number):Boolean
    {
        // Height increased and there may be more text.  It is possible that
        // there is more text even if isOverset isn't set.  If height
        // was specified, it will compose just enough text to fit the 
        // composition bounds and depending on text placement, it may not 
        // be overset.
        if (unscaledHeight > bounds.height &&
            (isOverset || !isNaN(_composeHeight)))
            return true;
            

        // For verticalAlign, if the composeHeight isn't the same as the
        // unscaledHeight, and the text isn't top aligned, we need to
        // recompose (or adjust the y values of all the text lines).
        var height:Number = isNaN(_composeHeight) ? 
                            contentHeight : _composeHeight;
        if (unscaledHeight != height)
        {
            var verticalAlign:String = getStyle("verticalAlign");
            var topAligned:Boolean = (verticalAlign == "top");
