Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.335
diff -u -r1.335 search.module
--- modules/search/search.module	10 Jan 2010 21:46:16 -0000	1.335
+++ modules/search/search.module	15 Jan 2010 20:04:09 -0000
@@ -901,7 +901,10 @@
   $form['#attributes']['class'][] = 'search-form';
   $form['module'] = array('#type' => 'value', '#value' => $type);
   $form['basic'] = array('#type' => 'item', '#title' => $prompt, '#id' => 'edit-keys');
-  $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
+  $form['basic']['inline'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('container-inline')),
+  );
   $form['basic']['inline']['keys'] = array(
     '#type' => 'textfield',
     '#title' => '',
Index: modules/trigger/trigger.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v
retrieving revision 1.21
diff -u -r1.21 trigger.admin.inc
--- modules/trigger/trigger.admin.inc	6 Nov 2009 03:59:06 -0000	1.21
+++ modules/trigger/trigger.admin.inc	15 Jan 2010 20:04:10 -0000
@@ -160,8 +160,8 @@
   }
 
   $form[$hook]['parent'] = array(
-    '#prefix' => "<div class='container-inline'>",
-    '#suffix' => '</div>',
+    '#type' => 'container',
+    '#attributes' => array('class' => array('container-inline')),
   );
   // List possible actions that may be assigned.
   if (count($options) != 0) {
Index: modules/path/path.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v
retrieving revision 1.40
diff -u -r1.40 path.admin.inc
--- modules/path/path.admin.inc	3 Jan 2010 00:44:53 -0000	1.40
+++ modules/path/path.admin.inc	15 Jan 2010 20:04:06 -0000
@@ -219,7 +219,10 @@
   $form['basic'] = array('#type' => 'fieldset',
     '#title' => t('Filter aliases')
   );
-  $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
+  $form['basic']['inline'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('container-inline')),
+  );
   $form['basic']['inline']['filter'] = array(
     '#type' => 'textfield',
     '#title' => '',