diff --git a/wrap/Method.cpp b/wrap/Method.cpp
index edfb80268..ae50a36ae 100644
--- a/wrap/Method.cpp
+++ b/wrap/Method.cpp
@@ -68,12 +68,14 @@ void Method::proxy_wrapper_fragments(FileWriter& proxyFile,
       << endl;
 
   // Document all overloads, if any
-  proxyFile.oss << "      % " << "" << endl;
-  proxyFile.oss << "      % " << "Method Overloads" << endl;
-  BOOST_FOREACH(ArgumentList argList, argLists) {
-    proxyFile.oss << "      % ";
-    argList.emit_prototype(proxyFile, name);
-    proxyFile.oss << endl;
+  if (argLists.size() > 1) {
+    proxyFile.oss << "      % " << "" << endl;
+    proxyFile.oss << "      % " << "Method Overloads" << endl;
+    BOOST_FOREACH(ArgumentList argList, argLists) {
+      proxyFile.oss << "      % ";
+      argList.emit_prototype(proxyFile, name);
+      proxyFile.oss << endl;
+    }
   }
 
   // For all overloads, check the number of arguments
diff --git a/wrap/tests/expected/Point2.m b/wrap/tests/expected/Point2.m
index 22dec9641..fa0741fe2 100644
--- a/wrap/tests/expected/Point2.m
+++ b/wrap/tests/expected/Point2.m
@@ -44,9 +44,6 @@ classdef Point2 < handle
     function varargout = argChar(this, varargin)
       % ARGCHAR usage: argChar(char a) : returns void
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % argChar(char a)
       if length(varargin) == 1 && isa(varargin{1},'char')
         geometry_wrapper(4, this, varargin{:});
       else
@@ -57,9 +54,6 @@ classdef Point2 < handle
     function varargout = argUChar(this, varargin)
       % ARGUCHAR usage: argUChar(unsigned char a) : returns void
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % argUChar(unsigned char a)
       if length(varargin) == 1 && isa(varargin{1},'char')
         geometry_wrapper(5, this, varargin{:});
       else
@@ -70,9 +64,6 @@ classdef Point2 < handle
     function varargout = dim(this, varargin)
       % DIM usage: dim() : returns int
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % dim()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(6, this, varargin{:});
       else
@@ -83,9 +74,6 @@ classdef Point2 < handle
     function varargout = returnChar(this, varargin)
       % RETURNCHAR usage: returnChar() : returns char
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % returnChar()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(7, this, varargin{:});
       else
@@ -96,9 +84,6 @@ classdef Point2 < handle
     function varargout = vectorConfusion(this, varargin)
       % VECTORCONFUSION usage: vectorConfusion() : returns VectorNotEigen
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % vectorConfusion()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(8, this, varargin{:});
       else
@@ -109,9 +94,6 @@ classdef Point2 < handle
     function varargout = x(this, varargin)
       % X usage: x() : returns double
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % x()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(9, this, varargin{:});
       else
@@ -122,9 +104,6 @@ classdef Point2 < handle
     function varargout = y(this, varargin)
       % Y usage: y() : returns double
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % y()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(10, this, varargin{:});
       else
diff --git a/wrap/tests/expected/Point3.m b/wrap/tests/expected/Point3.m
index 94d9c25b8..fd17df60b 100644
--- a/wrap/tests/expected/Point3.m
+++ b/wrap/tests/expected/Point3.m
@@ -43,9 +43,6 @@ classdef Point3 < handle
     function varargout = norm(this, varargin)
       % NORM usage: norm() : returns double
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % norm()
       if length(varargin) == 0
         varargout{1} = geometry_wrapper(14, this, varargin{:});
       else
diff --git a/wrap/tests/expected/Test.m b/wrap/tests/expected/Test.m
index 8e56df6fc..a82ae3ed3 100644
--- a/wrap/tests/expected/Test.m
+++ b/wrap/tests/expected/Test.m
@@ -56,9 +56,6 @@ classdef Test < handle
     function varargout = arg_EigenConstRef(this, varargin)
       % ARG_EIGENCONSTREF usage: arg_EigenConstRef(Matrix value) : returns void
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % arg_EigenConstRef(Matrix value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         geometry_wrapper(23, this, varargin{:});
       else
@@ -69,9 +66,6 @@ classdef Test < handle
     function varargout = create_MixedPtrs(this, varargin)
       % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< Test, SharedTest >
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % create_MixedPtrs()
       if length(varargin) == 0
         [ varargout{1} varargout{2} ] = geometry_wrapper(24, this, varargin{:});
       else
@@ -82,9 +76,6 @@ classdef Test < handle
     function varargout = create_ptrs(this, varargin)
       % CREATE_PTRS usage: create_ptrs() : returns pair< SharedTest, SharedTest >
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % create_ptrs()
       if length(varargin) == 0
         [ varargout{1} varargout{2} ] = geometry_wrapper(25, this, varargin{:});
       else
@@ -95,9 +86,6 @@ classdef Test < handle
     function varargout = print(this, varargin)
       % PRINT usage: print() : returns void
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % print()
       if length(varargin) == 0
         geometry_wrapper(26, this, varargin{:});
       else
@@ -108,9 +96,6 @@ classdef Test < handle
     function varargout = return_Point2Ptr(this, varargin)
       % RETURN_POINT2PTR usage: return_Point2Ptr(bool value) : returns Point2
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_Point2Ptr(bool value)
       if length(varargin) == 1 && isa(varargin{1},'logical')
         varargout{1} = geometry_wrapper(27, this, varargin{:});
       else
@@ -121,9 +106,6 @@ classdef Test < handle
     function varargout = return_Test(this, varargin)
       % RETURN_TEST usage: return_Test(Test value) : returns Test
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_Test(Test value)
       if length(varargin) == 1 && isa(varargin{1},'Test')
         varargout{1} = geometry_wrapper(28, this, varargin{:});
       else
@@ -134,9 +116,6 @@ classdef Test < handle
     function varargout = return_TestPtr(this, varargin)
       % RETURN_TESTPTR usage: return_TestPtr(Test value) : returns Test
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_TestPtr(Test value)
       if length(varargin) == 1 && isa(varargin{1},'Test')
         varargout{1} = geometry_wrapper(29, this, varargin{:});
       else
@@ -147,9 +126,6 @@ classdef Test < handle
     function varargout = return_bool(this, varargin)
       % RETURN_BOOL usage: return_bool(bool value) : returns bool
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_bool(bool value)
       if length(varargin) == 1 && isa(varargin{1},'logical')
         varargout{1} = geometry_wrapper(30, this, varargin{:});
       else
@@ -160,9 +136,6 @@ classdef Test < handle
     function varargout = return_double(this, varargin)
       % RETURN_DOUBLE usage: return_double(double value) : returns double
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_double(double value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = geometry_wrapper(31, this, varargin{:});
       else
@@ -173,9 +146,6 @@ classdef Test < handle
     function varargout = return_field(this, varargin)
       % RETURN_FIELD usage: return_field(Test t) : returns bool
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_field(Test t)
       if length(varargin) == 1 && isa(varargin{1},'Test')
         varargout{1} = geometry_wrapper(32, this, varargin{:});
       else
@@ -186,9 +156,6 @@ classdef Test < handle
     function varargout = return_int(this, varargin)
       % RETURN_INT usage: return_int(int value) : returns int
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_int(int value)
       if length(varargin) == 1 && isa(varargin{1},'numeric')
         varargout{1} = geometry_wrapper(33, this, varargin{:});
       else
@@ -199,9 +166,6 @@ classdef Test < handle
     function varargout = return_matrix1(this, varargin)
       % RETURN_MATRIX1 usage: return_matrix1(Matrix value) : returns Matrix
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_matrix1(Matrix value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = geometry_wrapper(34, this, varargin{:});
       else
@@ -212,9 +176,6 @@ classdef Test < handle
     function varargout = return_matrix2(this, varargin)
       % RETURN_MATRIX2 usage: return_matrix2(Matrix value) : returns Matrix
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_matrix2(Matrix value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = geometry_wrapper(35, this, varargin{:});
       else
@@ -225,9 +186,6 @@ classdef Test < handle
     function varargout = return_pair(this, varargin)
       % RETURN_PAIR usage: return_pair(Vector v, Matrix A) : returns pair< Vector, Matrix >
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_pair(Vector v, Matrix A)
       if length(varargin) == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')
         [ varargout{1} varargout{2} ] = geometry_wrapper(36, this, varargin{:});
       else
@@ -238,9 +196,6 @@ classdef Test < handle
     function varargout = return_ptrs(this, varargin)
       % RETURN_PTRS usage: return_ptrs(Test p1, Test p2) : returns pair< SharedTest, SharedTest >
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_ptrs(Test p1, Test p2)
       if length(varargin) == 2 && isa(varargin{1},'Test') && isa(varargin{2},'Test')
         [ varargout{1} varargout{2} ] = geometry_wrapper(37, this, varargin{:});
       else
@@ -251,9 +206,6 @@ classdef Test < handle
     function varargout = return_size_t(this, varargin)
       % RETURN_SIZE_T usage: return_size_t(size_t value) : returns size_t
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_size_t(size_t value)
       if length(varargin) == 1 && isa(varargin{1},'numeric')
         varargout{1} = geometry_wrapper(38, this, varargin{:});
       else
@@ -264,9 +216,6 @@ classdef Test < handle
     function varargout = return_string(this, varargin)
       % RETURN_STRING usage: return_string(string value) : returns string
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_string(string value)
       if length(varargin) == 1 && isa(varargin{1},'char')
         varargout{1} = geometry_wrapper(39, this, varargin{:});
       else
@@ -277,9 +226,6 @@ classdef Test < handle
     function varargout = return_vector1(this, varargin)
       % RETURN_VECTOR1 usage: return_vector1(Vector value) : returns Vector
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_vector1(Vector value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = geometry_wrapper(40, this, varargin{:});
       else
@@ -290,9 +236,6 @@ classdef Test < handle
     function varargout = return_vector2(this, varargin)
       % RETURN_VECTOR2 usage: return_vector2(Vector value) : returns Vector
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % return_vector2(Vector value)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = geometry_wrapper(41, this, varargin{:});
       else
diff --git a/wrap/tests/expected_namespaces/+ns2/ClassA.m b/wrap/tests/expected_namespaces/+ns2/ClassA.m
index c7ab901ae..f31825851 100644
--- a/wrap/tests/expected_namespaces/+ns2/ClassA.m
+++ b/wrap/tests/expected_namespaces/+ns2/ClassA.m
@@ -40,9 +40,6 @@ classdef ClassA < handle
     function varargout = memberFunction(this, varargin)
       % MEMBERFUNCTION usage: memberFunction() : returns double
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % memberFunction()
       if length(varargin) == 0
         varargout{1} = testNamespaces_wrapper(9, this, varargin{:});
       else
@@ -53,9 +50,6 @@ classdef ClassA < handle
     function varargout = nsArg(this, varargin)
       % NSARG usage: nsArg(ClassB arg) : returns int
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % nsArg(ClassB arg)
       if length(varargin) == 1 && isa(varargin{1},'ns1.ClassB')
         varargout{1} = testNamespaces_wrapper(10, this, varargin{:});
       else
@@ -66,9 +60,6 @@ classdef ClassA < handle
     function varargout = nsReturn(this, varargin)
       % NSRETURN usage: nsReturn(double q) : returns ns2::ns3::ClassB
       % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
-      % 
-      % Method Overloads
-      % nsReturn(double q)
       if length(varargin) == 1 && isa(varargin{1},'double')
         varargout{1} = testNamespaces_wrapper(11, this, varargin{:});
       else