diff --git a/reference/classkit/functions/classkit-import.xml b/reference/classkit/functions/classkit-import.xml
index 89a1b4b3d1..bad22408f2 100644
--- a/reference/classkit/functions/classkit-import.xml
+++ b/reference/classkit/functions/classkit-import.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="function.classkit-import">
  <refnamediv>
   <refname>classkit_import</refname>
   <refpurpose>Import new class method definitions from a file</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>classkit_import</methodname>
@@ -14,7 +14,7 @@
   &note.classkit.selfmanipulation;
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -29,14 +29,14 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    Associative array of imported methods
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
diff --git a/reference/classkit/functions/classkit-method-add.xml b/reference/classkit/functions/classkit-method-add.xml
index 762b0f2dc6..3dde63adc6 100644
--- a/reference/classkit/functions/classkit-method-add.xml
+++ b/reference/classkit/functions/classkit-method-add.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry id="function.classkit-method-add">
  <refnamediv>
   <refname>classkit_method_add</refname>
   <refpurpose>Dynamically adds a new method to a given class</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>classkit_method_add</methodname>
@@ -17,7 +17,7 @@
   </methodsynopsis>
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -64,24 +64,24 @@
        <constant>CLASSKIT_ACC_PRIVATE</constant>
       </para>
       <note>
-       <simpara>
+       <para>
         This parameter is only used as of PHP 5, because, prior to this,
         all methods were public.
-       </simpara>
+       </para>
       </note>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -121,14 +121,16 @@ echo $e->add(12, 4);
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>classkit_method_copy</function>,
-   <function>classkit_method_redefine</function>,
-   <function>classkit_method_remove</function>,
-   <function>classkit_method_rename</function>&listendand;
-   <function>create_function</function>
+   <simplelist>
+    <member><function>classkit_method_copy</function></member>
+    <member><function>classkit_method_redefine</function></member>
+    <member><function>classkit_method_remove</function></member>
+    <member><function>classkit_method_rename</function></member>
+    <member><function>create_function</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/classkit/functions/classkit-method-copy.xml b/reference/classkit/functions/classkit-method-copy.xml
index 2764ed5e17..b40226fcb3 100644
--- a/reference/classkit/functions/classkit-method-copy.xml
+++ b/reference/classkit/functions/classkit-method-copy.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.classkit-method-copy">
  <refnamediv>
   <refname>classkit_method_copy</refname>
   <refpurpose>Copies a method from class to another</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>classkit_method_copy</methodname>
@@ -16,7 +16,7 @@
   </methodsynopsis>
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -56,14 +56,14 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -98,13 +98,15 @@ foo!
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>classkit_method_add</function>,
-   <function>classkit_method_redefine</function>,
-   <function>classkit_method_remove</function>&listendand;
-   <function>classkit_method_rename</function>
+   <simplelist>
+    <member><function>classkit_method_add</function></member>
+    <member><function>classkit_method_redefine</function></member>
+    <member><function>classkit_method_remove</function></member>
+    <member><function>classkit_method_rename</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/classkit/functions/classkit-method-redefine.xml b/reference/classkit/functions/classkit-method-redefine.xml
index 115351df92..3375253451 100644
--- a/reference/classkit/functions/classkit-method-redefine.xml
+++ b/reference/classkit/functions/classkit-method-redefine.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry id="function.classkit-method-redefine">
  <refnamediv>
   <refname>classkit_method_redefine</refname>
   <refpurpose>Dynamically changes the code of the given method</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>classkit_method_redefine</methodname>
@@ -18,7 +18,7 @@
   &note.classkit.selfmanipulation;
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -65,24 +65,24 @@
        <constant>CLASSKIT_ACC_PRIVATE</constant>
       </para>
       <note>
-       <simpara>
+       <para>
         This parameter is only used as of PHP 5, because, prior to this,
         all methods were public.
-       </simpara>
+       </para>
       </note>
      </listitem>
     </varlistentry>
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -126,13 +126,15 @@ After: bar!
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>classkit_method_add</function>,
-   <function>classkit_method_copy</function>,
-   <function>classkit_method_remove</function>&listendand;
-   <function>classkit_method_rename</function>
+   <simplelist>
+    <member><function>classkit_method_add</function></member>
+    <member><function>classkit_method_copy</function></member>
+    <member><function>classkit_method_remove</function></member>
+    <member><function>classkit_method_rename</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/classkit/functions/classkit-method-remove.xml b/reference/classkit/functions/classkit-method-remove.xml
index 421af6dd3b..d3b8e074ac 100644
--- a/reference/classkit/functions/classkit-method-remove.xml
+++ b/reference/classkit/functions/classkit-method-remove.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <refentry id="function.classkit-method-remove">
  <refnamediv>
   <refname>classkit_method_remove</refname>
   <refpurpose>Dynamically removes the given method</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>classkit_method_remove</methodname>
@@ -15,7 +15,7 @@
   &note.classkit.selfmanipulation;
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -38,14 +38,14 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -83,13 +83,15 @@ bar
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>classkit_method_add</function>,
-   <function>classkit_method_copy</function>,
-   <function>classkit_method_redefine</function>&listendand;
-   <function>classkit_method_rename</function>
+   <simplelist>
+    <member><function>classkit_method_add</function></member>
+    <member><function>classkit_method_copy</function></member>
+    <member><function>classkit_method_redefine</function></member>
+    <member><function>classkit_method_rename</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/classkit/functions/classkit-method-rename.xml b/reference/classkit/functions/classkit-method-rename.xml
index 744f549e6b..e77d855ce9 100644
--- a/reference/classkit/functions/classkit-method-rename.xml
+++ b/reference/classkit/functions/classkit-method-rename.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <refentry id="function.classkit-method-rename">
  <refnamediv>
   <refname>classkit_method_rename</refname>
   <refpurpose>Dynamically changes the name of the given method</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>classkit_method_rename</methodname>
@@ -16,7 +16,7 @@
   &note.classkit.selfmanipulation;
   &warn.experimental.func;
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -47,14 +47,14 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    &return.success;
   </para>
  </refsect1>
  <!-- No changelog: it's only in PECL. -->
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -89,13 +89,15 @@ foo!
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>classkit_method_add</function>,
-   <function>classkit_method_copy</function>,
-   <function>classkit_method_redefine</function>&listendand;
-   <function>classkit_method_remove</function>
+   <simplelist>
+    <member><function>classkit_method_add</function></member>
+    <member><function>classkit_method_copy</function></member>
+    <member><function>classkit_method_redefine</function></member>
+    <member><function>classkit_method_remove</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>