break down some error format strings

Most errorformats are now expressed 1 "clause" per line.
Cleanup.
Backport of small fixes from the buffers branch.
Merge branch 'master' into buffers