This makes it behave more like the html output.  That will make some
subsequent changes across all output formats easier.