diff --git a/Doc/texinputs/howto.cls b/Doc/texinputs/howto.cls
index 115912324ec..a1242217e8a 100644
--- a/Doc/texinputs/howto.cls
+++ b/Doc/texinputs/howto.cls
@@ -40,12 +40,15 @@
 \RequirePackage{python}
 
 
+% need to do one of these....
+\newcommand{\@doHorizontalRule}{\rule{\textwidth}{1pt}}
+
+
 % Change the title page to look a bit better, and fit in with the
 % fncychap ``Bjarne'' style a bit better.
 %
 \renewcommand{\maketitle}{
-  \@ifundefined{ChTitleVar}{}{
-    \mghrulefill{\RW}}
+  \@doHorizontalRule
   \@ifundefined{pdfinfo}{}{
     \pdfinfo{
       /Author (\@author)
@@ -74,8 +77,7 @@
     \parskip = 0mm
     \OldTableofcontents
   \endgroup
-  \@ifundefined{ChTitleVar}{}{
-    \mghrulefill{\RW}}
+  \@doHorizontalRule
   \vspace{12pt}
 }  
 
diff --git a/Doc/texinputs/manual.cls b/Doc/texinputs/manual.cls
index a87b510b707..563c3f86e6a 100644
--- a/Doc/texinputs/manual.cls
+++ b/Doc/texinputs/manual.cls
@@ -32,7 +32,16 @@
 \RequirePackage{times}\typeout{Using times fonts instead of Computer Modern.}
 
 
-% Required package:
+% Required packages:
+%
+% The "fncychap" package is used to get the nice chapter headers.  The
+% .sty file is distributed with Python, so you should not need to disable
+% it.  You'd also end up with a mixed page style; uglier than stock LaTeX!
+%
+\RequirePackage[Bjarne]{fncychap}\typeout{Using fancy chapter headings.}
+% Do horizontal rules it this way to match:
+\newcommand{\@doHorizontalRule}{\mghrulefill{\RW}}
+%
 %
 % This gives us all the Python-specific markup that we really want.
 % This should come last.  Do not change this.
@@ -47,8 +56,7 @@
   \begin{titlepage}%
     \let\footnotesize\small
     \let\footnoterule\relax
-    \@ifundefined{ChTitleVar}{}{%
-      \mghrulefill{\RW}}%
+    \@doHorizontalRule%
     \@ifundefined{pdfinfo}{}{
       \pdfinfo{
         /Author (\@author)
diff --git a/Doc/texinputs/python.sty b/Doc/texinputs/python.sty
index b2ef8f11f9e..d432a9fc558 100644
--- a/Doc/texinputs/python.sty
+++ b/Doc/texinputs/python.sty
@@ -6,13 +6,6 @@
 \ProvidesPackage{python}
              [1998/01/11 LaTeX package (Python markup)]
 
-% The "fncychap" package is used to get the nice chapter headers.  The
-% .sty file is distributed with Python, so you should not need to disable
-% it.  You'd also end up with a mixed page style; uglier than stock LaTeX!
-%
-\RequirePackage[Bjarne]{fncychap}\typeout{Using fancy chapter headings.}
-
-
 % for PDF output, use maximal compression & a lot of other stuff
 % (test for PDF recommended by Tanmoy Bhattacharya <tanmoy@qcd.lanl.gov>)
 %
@@ -406,6 +399,8 @@
 
 \let\nodename=\label
 
+\newcommand{\sectcode}[1]{{\sectcodefont{#1}}}
+
 % For these commands, use \command{} to get the typography right, not 
 % {\command}.  This works better with the texinfo translation.
 \newcommand{\ABC}{{\sc abc}}
@@ -415,7 +410,7 @@
 \newcommand{\Cpp}{C\protect\raisebox{.18ex}{++}}
 \newcommand{\C}{C}
 \newcommand{\EOF}{{\sc eof}}
-\newcommand{\NULL}{\code{NULL}}
+\newcommand{\NULL}{\sectcode{NULL}}
 
 % code is the most difficult one...
 \newcommand{\code}[1]{{\@vobeyspaces\@noligs\def\{{\char`\{}\def\}{\char`\}}\def\~{\char`\~}\def\^{\char`\^}\def\e{\char`\\}\def\${\char`\$}\def\#{\char`\#}\def\&{\char`\&}\def\%{\char`\%}%
@@ -463,17 +458,17 @@
 % For now, don't do anything really fancy with them; just use them as
 % logical markup.  This might change in the future.
 %
-\let\module=\code
-\let\keyword=\code
-\let\exception=\code
-\let\class=\code
-\let\function=\code
-\let\member=\code
-\let\method=\code
+\let\module=\sectcode
+\let\keyword=\sectcode
+\let\exception=\sectcode
+\let\class=\sectcode
+\let\function=\sectcode
+\let\member=\sectcode
+\let\method=\sectcode
 
-\let\cfunction=\code
-\let\ctype=\code
-\let\cdata=\code
+\let\cfunction=\sectcode
+\let\ctype=\sectcode
+\let\cdata=\sectcode
 
 \newcommand{\mimetype}[1]{{\small\textsf{#1}}}
 % The \! is a "negative thin space" in math mode.
@@ -538,8 +533,6 @@
   \advance\@tempdima \leftmargin\makebox[\@tempdima][l]{#1}%
 }
 
-\newcommand{\sectcode}[1]{{\sectcodefont{#1}}}
-
 % Cross-referencing (AMK)
 % Sample usage:
 %  \begin{seealso}