Improve upon r296618 to keep lines < 80 characters.
Pointed out by: jhb Sponsored by: Essen Hackathon 2016