web commit by tschwinge: Improve formatting from hell.