diff --git a/language/predefined/weakmap.xml b/language/predefined/weakmap.xml
index ebdca034e0..1da2745bd0 100644
--- a/language/predefined/weakmap.xml
+++ b/language/predefined/weakmap.xml
@@ -55,6 +55,9 @@
     </classsynopsisinfo>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakmap')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.weakmap')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
      <xi:fallback/>
     </xi:include>
diff --git a/language/predefined/weakmap/construct.xml b/language/predefined/weakmap/construct.xml
index d882fe43af..c5a9523ec4 100644
--- a/language/predefined/weakmap/construct.xml
+++ b/language/predefined/weakmap/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>WeakMap::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs a new map.
   </para>
@@ -24,14 +24,6 @@
   &no.function.parameters;
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/apcu/apcuiterator.xml b/reference/apcu/apcuiterator.xml
index 7a1e07cd75..6b4c75ac65 100644
--- a/reference/apcu/apcuiterator.xml
+++ b/reference/apcu/apcuiterator.xml
@@ -43,7 +43,13 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.apcuiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.apcuiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.apcuiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/apcu/apcuiterator/construct.xml b/reference/apcu/apcuiterator/construct.xml
index 0693c0bd5a..dcf9a1dbd3 100644
--- a/reference/apcu/apcuiterator/construct.xml
+++ b/reference/apcu/apcuiterator/construct.xml
@@ -9,13 +9,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>APCUIterator::__construct</methodname>
    <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>search</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>format</parameter><initializer>APC_ITER_ALL</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>chunk_size</parameter><initializer>100</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>list</parameter><initializer>APC_LIST_ACTIVE</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs an <classname>APCUIterator</classname> <type>object</type>.
   </para>
@@ -65,14 +65,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An <classname>APCUIterator</classname> <type>object</type> on success,
-   or &null; on failure.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/curl/curlstringfile/construct.xml b/reference/curl/curlstringfile/construct.xml
index e4e2e67dfd..1e4c9836a9 100644
--- a/reference/curl/curlstringfile/construct.xml
+++ b/reference/curl/curlstringfile/construct.xml
@@ -48,13 +48,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <classname>CURLStringFile</classname> object.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/fann/fannconnection.xml b/reference/fann/fannconnection.xml
index 1e20f14cbb..6582b2d435 100644
--- a/reference/fann/fannconnection.xml
+++ b/reference/fann/fannconnection.xml
@@ -48,7 +48,12 @@
 
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.fannconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.fannconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.fannconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/fann/fannconnection/construct.xml b/reference/fann/fannconnection/construct.xml
index d792b6842d..aac25fa617 100644
--- a/reference/fann/fannconnection/construct.xml
+++ b/reference/fann/fannconnection/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>FANNConnection::__construct</methodname>
    <methodparam><type>int</type><parameter>from_neuron</parameter></methodparam>
    <methodparam><type>int</type><parameter>to_neuron</parameter></methodparam>
    <methodparam><type>float</type><parameter>weight</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Create new connection and initialize its params. After creating the connection, only weight can be changed.
   </para>
@@ -27,7 +27,7 @@
     <term><parameter>from_neuron</parameter></term>
     <listitem>
      <para>
-      The postion number of starting neuron.
+      The position number of starting neuron.
      </para>
     </listitem>
    </varlistentry>
@@ -35,7 +35,7 @@
     <term><parameter>to_neuron</parameter></term>
     <listitem>
      <para>
-      The postion number of terminating neuron.
+      The position number of terminating neuron.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/gender/gender.xml b/reference/gender/gender.xml
index 79df3d0dd0..4d0723ab76 100644
--- a/reference/gender/gender.xml
+++ b/reference/gender/gender.xml
@@ -406,7 +406,12 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gender')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gender')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gender')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/gender/gender/construct.xml b/reference/gender/gender/construct.xml
index 328aefc32e..b6863c1547 100644
--- a/reference/gender/gender/construct.xml
+++ b/reference/gender/gender/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Gender\Gender::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>dsn</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     Create a Gender object optionally connecting to an external name
     dictionary. When no external database was given, compiled in data will be
@@ -34,13 +34,6 @@
    </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/gmagick/gmagick.xml b/reference/gmagick/gmagick.xml
index df37d5b5c0..c45775911c 100644
--- a/reference/gmagick/gmagick.xml
+++ b/reference/gmagick/gmagick.xml
@@ -31,8 +31,13 @@
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
-      <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagick')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/gmagick/gmagick/construct.xml b/reference/gmagick/gmagick/construct.xml
index 5a9d26536c..349d1cbfbf 100644
--- a/reference/gmagick/gmagick/construct.xml
+++ b/reference/gmagick/gmagick/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Gmagick::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    The <classname>Gmagick</classname> constructor.
   </para>
@@ -35,13 +35,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new <classname>Gmagick</classname> object.
-  </para>
- </refsect1>
-
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/gmagick/gmagickpixel.xml b/reference/gmagick/gmagickpixel.xml
index 3a6d8e1d16..600bc71195 100644
--- a/reference/gmagick/gmagickpixel.xml
+++ b/reference/gmagick/gmagickpixel.xml
@@ -33,7 +33,12 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagickpixel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagickpixel')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagickpixel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/gmagick/gmagickpixel/construct.xml b/reference/gmagick/gmagickpixel/construct.xml
index 09b3b31d6f..786e50fe52 100644
--- a/reference/gmagick/gmagickpixel/construct.xml
+++ b/reference/gmagick/gmagickpixel/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>GmagickPixel::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs an <classname>GmagickPixel</classname> object. If a color is specified, the object is constructed and then initialised with that color before being returned. 
   </para>
@@ -35,14 +35,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The <classname>GmagickPixel</classname> object.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/imagick/imagick.xml b/reference/imagick/imagick.xml
index 89925209d4..85ef126b96 100644
--- a/reference/imagick/imagick.xml
+++ b/reference/imagick/imagick.xml
@@ -14,7 +14,12 @@
       <interfacename>Iterator</interfacename>
      </oointerface>
     </classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagick')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
   </section>
 
diff --git a/reference/imagick/imagick/construct.xml b/reference/imagick/imagick/construct.xml
index 8d59741fd8..aad9f94a97 100644
--- a/reference/imagick/imagick/construct.xml
+++ b/reference/imagick/imagick/construct.xml
@@ -8,10 +8,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Imagick::__construct</methodname>
    <methodparam choice="opt"><type>mixed</type><parameter>files</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates an Imagick instance for a specified image or set of images.
   </para>
@@ -31,12 +31,6 @@
    </varlistentry>
   </variablelist>                                        
  </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object on success.
-  </para>
- </refsect1>
 
  <refsect1 role="errors">
   &reftitle.errors;
diff --git a/reference/memcached/memcached.xml b/reference/memcached/memcached.xml
index 9bebce82b6..7b5ebedb12 100644
--- a/reference/memcached/memcached.xml
+++ b/reference/memcached/memcached.xml
@@ -31,9 +31,13 @@
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
-    
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/memcached/memcached/construct.xml b/reference/memcached/memcached/construct.xml
index 541954fada..8d1b3b84a7 100644
--- a/reference/memcached/memcached/construct.xml
+++ b/reference/memcached/memcached/construct.xml
@@ -39,13 +39,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Memcached object.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/oauth/oauth.xml b/reference/oauth/oauth.xml
index 7f4b1ade1a..2aa3e702dd 100644
--- a/reference/oauth/oauth.xml
+++ b/reference/oauth/oauth.xml
@@ -48,7 +48,12 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.oauth')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.oauth')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.oauth')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/oauth/oauth/construct.xml b/reference/oauth/oauth/construct.xml
index ad25aeaa05..7a2e1ddffb 100644
--- a/reference/oauth/oauth/construct.xml
+++ b/reference/oauth/oauth/construct.xml
@@ -9,13 +9,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>OAuth::__construct</methodname>
    <methodparam><type>string</type><parameter>consumer_key</parameter></methodparam>
    <methodparam><type>string</type><parameter>consumer_secret</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>signature_method</parameter><initializer><constant>OAUTH_SIG_METHOD_HMACSHA1</constant></initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>auth_type</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates a new OAuth object
   </para>
diff --git a/reference/pht/atomicinteger/construct.xml b/reference/pht/atomicinteger/construct.xml
index 599fd80b83..070f802097 100644
--- a/reference/pht/atomicinteger/construct.xml
+++ b/reference/pht/atomicinteger/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>AtomicInteger</type><methodname>pht\AtomicInteger::__construct</methodname>
+  <constructorsynopsis>
+   <modifier>public</modifier> <methodname>pht\AtomicInteger::__construct</methodname>
    <methodparam choice="opt"><type>int</type><parameter>value</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Handles the creation of a new atomic integer.
   </para>
@@ -32,13 +32,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   No return value.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/pht/pht.atomicinteger.xml b/reference/pht/pht.atomicinteger.xml
index fbab986468..6abbf4d75a 100644
--- a/reference/pht/pht.atomicinteger.xml
+++ b/reference/pht/pht.atomicinteger.xml
@@ -47,8 +47,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-atomicinteger')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-atomicinteger')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-atomicinteger')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/pht/pht.vector.xml b/reference/pht/pht.vector.xml
index 9e3cb7aa92..1c24c5e532 100644
--- a/reference/pht/pht.vector.xml
+++ b/reference/pht/pht.vector.xml
@@ -49,7 +49,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-vector')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-vector')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pht-vector')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/pht/vector/construct.xml b/reference/pht/vector/construct.xml
index c2f858d740..ec417bf99c 100644
--- a/reference/pht/vector/construct.xml
+++ b/reference/pht/vector/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Vector</type><methodname>pht\Vector::__construct</methodname>
+  <constructorsynopsis>
+   <modifier>public</modifier> <methodname>pht\Vector::__construct</methodname>
    <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>value</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Handles the creation of a new vector.
   </para>
@@ -41,13 +41,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   No return value.
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/pthreads/pool.xml b/reference/pthreads/pool.xml
index bd5b19ada8..53f40c2d54 100644
--- a/reference/pthreads/pool.xml
+++ b/reference/pthreads/pool.xml
@@ -56,9 +56,13 @@
      <varname linkend="pool.props.last">last</varname>
     </fieldsynopsis>
 
-    
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pool')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pool')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pool')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/pthreads/pool/construct.xml b/reference/pthreads/pool/construct.xml
index 287b46b1f2..3be698b9ed 100644
--- a/reference/pthreads/pool/construct.xml
+++ b/reference/pthreads/pool/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Pool</type><methodname>Pool::__construct</methodname>
+  <constructorsynopsis>
+   <modifier>public</modifier> <methodname>Pool::__construct</methodname>
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>class</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>ctor</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Construct a new pool of workers. Pools lazily create their threads, which
    means new threads will only be spawned when they are required to execute
@@ -53,13 +53,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new pool
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/rrd/rrdcreator.xml b/reference/rrd/rrdcreator.xml
index 344b8cd2d2..2abef6f7fe 100644
--- a/reference/rrd/rrdcreator.xml
+++ b/reference/rrd/rrdcreator.xml
@@ -32,7 +32,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdcreator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdcreator')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdcreator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/rrd/rrdcreator/construct.xml b/reference/rrd/rrdcreator/construct.xml
index 1779039ec1..ba795f2acc 100644
--- a/reference/rrd/rrdcreator/construct.xml
+++ b/reference/rrd/rrdcreator/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>RRDCreator::__construct</methodname>
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>startTime</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>step</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates new <classname>RRDCreator</classname> instance.
   </para>
@@ -51,12 +51,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/rrd/rrdgraph.xml b/reference/rrd/rrdgraph.xml
index 32cc439ae8..6d83bef1c6 100644
--- a/reference/rrd/rrdgraph.xml
+++ b/reference/rrd/rrdgraph.xml
@@ -33,7 +33,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdgraph')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdgraph')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdgraph')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/rrd/rrdgraph/construct.xml b/reference/rrd/rrdgraph/construct.xml
index 2bb2d58a38..2e92504344 100644
--- a/reference/rrd/rrdgraph/construct.xml
+++ b/reference/rrd/rrdgraph/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>RRDGraph::__construct</methodname>
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates new <classname>RRDGraph</classname> instance. This instance is responsible for rendering
    the result of RRD database query into image.
@@ -33,12 +33,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/rrd/rrdupdater.xml b/reference/rrd/rrdupdater.xml
index 9d961d4b62..6af29c7b28 100644
--- a/reference/rrd/rrdupdater.xml
+++ b/reference/rrd/rrdupdater.xml
@@ -33,7 +33,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdupdater')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdupdater')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdupdater')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/rrd/rrdupdater/construct.xml b/reference/rrd/rrdupdater/construct.xml
index 460c9e0152..fb2ad1efc5 100644
--- a/reference/rrd/rrdupdater/construct.xml
+++ b/reference/rrd/rrdupdater/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>RRDUpdater::__construct</methodname>
    <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates new RRDUpdater instance. This instance is responsible for updating
    the RRD database file.
@@ -33,12 +33,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/simplexml/simplexmlelement/construct.xml b/reference/simplexml/simplexmlelement/construct.xml
index 1fbbd327c8..0f1561963f 100644
--- a/reference/simplexml/simplexmlelement/construct.xml
+++ b/reference/simplexml/simplexmlelement/construct.xml
@@ -81,15 +81,7 @@
    </variablelist>
   </para>
  </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SimpleXMLElement</type> object representing 
-   <parameter>data</parameter>.
-  </para>
- </refsect1>
- 
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/snmp/snmp/construct.xml b/reference/snmp/snmp/construct.xml
index d61f35d02d..921b3f5c49 100644
--- a/reference/snmp/snmp/construct.xml
+++ b/reference/snmp/snmp/construct.xml
@@ -100,13 +100,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns SNMP object representing remote <acronym>SNMP</acronym> agent.
-  </para>
- </refsect1>
-
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/sqlite3/sqlite3/construct.xml b/reference/sqlite3/sqlite3/construct.xml
index 5f62f11f76..4d59f56d39 100644
--- a/reference/sqlite3/sqlite3/construct.xml
+++ b/reference/sqlite3/sqlite3/construct.xml
@@ -82,13 +82,6 @@
 
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an SQLite3 object on success.
-  </para>
- </refsect1>
-
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
diff --git a/reference/stream/streamwrapper/destruct.xml b/reference/stream/streamwrapper/destruct.xml
index 7abd2d943b..9aaf5da78b 100644
--- a/reference/stream/streamwrapper/destruct.xml
+++ b/reference/stream/streamwrapper/destruct.xml
@@ -25,13 +25,6 @@
   &no.function.parameters;
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/svm/svm.xml b/reference/svm/svm.xml
index 0b31b96105..9a1731df2d 100644
--- a/reference/svm/svm.xml
+++ b/reference/svm/svm.xml
@@ -166,7 +166,12 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svm')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svm')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svm')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/svm/svm/construct.xml b/reference/svm/svm/construct.xml
index eb4985999d..c48c67bd98 100644
--- a/reference/svm/svm/construct.xml
+++ b/reference/svm/svm/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SVM::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs a new SVM object ready to accept training data. 
   </para>
@@ -24,10 +24,11 @@
   &no.function.parameters;
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
+ <refsect1 role="errors">
+  &reftitle.errors;
   <para>
-   Throws SVMException if the libsvm library could not be loaded
+   Throws a <classname>SVMException</classname> if the libsvm
+   library could not be loaded.
   </para>
  </refsect1>
 
diff --git a/reference/svm/svmmodel.xml b/reference/svm/svmmodel.xml
index 4bbffee2ff..88505f21c3 100644
--- a/reference/svm/svmmodel.xml
+++ b/reference/svm/svmmodel.xml
@@ -34,7 +34,12 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svmmodel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svmmodel')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svmmodel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/svm/svmmodel/construct.xml b/reference/svm/svmmodel/construct.xml
index 21713d46d8..bd324e6233 100644
--- a/reference/svm/svmmodel/construct.xml
+++ b/reference/svm/svmmodel/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SVMModel::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Build a new SVMModel. Models will usually be created from the 
    SVM::train function, but then saved models may be restored directly.
@@ -36,10 +36,10 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
+ <refsect1 role="errors">
+  &reftitle.errors;
   <para>
-   Throws SVMException on error
+   Throws a <classname>SVMException</classname> on error
   </para>
  </refsect1>
 
diff --git a/reference/tidy/tidy/construct.xml b/reference/tidy/tidy/construct.xml
index c1daaa506c..9fa1336dba 100644
--- a/reference/tidy/tidy/construct.xml
+++ b/reference/tidy/tidy/construct.xml
@@ -74,13 +74,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the new <classname>tidy</classname> instance.
-  </para>
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
diff --git a/reference/tokenizer/phptoken/construct.xml b/reference/tokenizer/phptoken/construct.xml
index b3672f78f7..d99e963bae 100644
--- a/reference/tokenizer/phptoken/construct.xml
+++ b/reference/tokenizer/phptoken/construct.xml
@@ -59,13 +59,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new PhpToken instance.
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/v8js/v8js.xml b/reference/v8js/v8js.xml
index 841fc79493..21125195d1 100644
--- a/reference/v8js/v8js.xml
+++ b/reference/v8js/v8js.xml
@@ -55,7 +55,12 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.v8js')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.v8js')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.v8js')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/v8js/v8js/construct.xml b/reference/v8js/v8js/construct.xml
index 08c28db591..838906a21b 100644
--- a/reference/v8js/v8js/construct.xml
+++ b/reference/v8js/v8js/construct.xml
@@ -9,13 +9,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>V8Js::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>object_name</parameter><initializer>"PHP"</initializer></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>variables</parameter><initializer>array()</initializer></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>extensions</parameter><initializer>array()</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>report_uncaught_exceptions</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs a new <classname>V8Js</classname> object.
   </para>
@@ -69,14 +69,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new V8Js context object.
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/xlswriter/xlsx-kernel.xml b/reference/xlswriter/xlsx-kernel.xml
index c9fd375d3d..6485b348f1 100644
--- a/reference/xlswriter/xlsx-kernel.xml
+++ b/reference/xlswriter/xlsx-kernel.xml
@@ -33,8 +33,12 @@
 <!-- }}} -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.vtiful-kernel-excel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.vtiful-kernel-excel')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.vtiful-kernel-excel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/xlswriter/xlsx-kernel/construct.xml b/reference/xlswriter/xlsx-kernel/construct.xml
index 4f0fa2de1d..f0348d5d3f 100644
--- a/reference/xlswriter/xlsx-kernel/construct.xml
+++ b/reference/xlswriter/xlsx-kernel/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::__construct</methodname>
    <methodparam><type>array</type><parameter>config</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     <classname>Vtiful\Kernel\Excel</classname> constructor, create a class object.
   </para>
@@ -32,14 +32,7 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
+ <refsect1 role="examples">
   &reftitle.examples;
   <example>
    <title>example</title>
diff --git a/reference/xmldiff/xmldiff-base/construct.xml b/reference/xmldiff/xmldiff-base/construct.xml
index 92a282b9cc..b224308cd0 100644
--- a/reference/xmldiff/xmldiff-base/construct.xml
+++ b/reference/xmldiff/xmldiff-base/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>XMLDiff\Base::__construct</methodname>
    <methodparam><type>string</type><parameter>nsname</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Base constructor for all the worker classes in the xmldiff extension.
   </para>
@@ -33,14 +33,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/xmldiff/xmldiff.base.xml b/reference/xmldiff/xmldiff.base.xml
index 90fb26fd6e..fb26d6ccb9 100644
--- a/reference/xmldiff/xmldiff.base.xml
+++ b/reference/xmldiff/xmldiff.base.xml
@@ -33,7 +33,12 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback/>
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/xsl/xsltprocessor/construct.xml b/reference/xsl/xsltprocessor/construct.xml
index f8c4626cb9..6c7377783b 100644
--- a/reference/xsl/xsltprocessor/construct.xml
+++ b/reference/xsl/xsltprocessor/construct.xml
@@ -21,13 +21,6 @@
   &no.function.parameters;
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/zookeeper/zookeeper/construct.xml b/reference/zookeeper/zookeeper/construct.xml
index dbb69ba72c..68d3889369 100644
--- a/reference/zookeeper/zookeeper/construct.xml
+++ b/reference/zookeeper/zookeeper/construct.xml
@@ -51,13 +51,6 @@
   </variablelist>
  </refsect1>
 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
  <refsect1 role="errors">
   &reftitle.errors;
   <para>