Issue #23: improve formatting a bit again.