Fix trailing spaces and split long Python lines

Fix trailing spaces and split long Python lines

Also remove commented out duplicate makeinfo configure check,
and remove duplicate stalled Texinfo macros.

All these nitpicks have been caught by checking output from
git diff master dev/texi2html