Reformat ErrorUtils; simplify, add TODOs...

There is some very annoying adherence, even in that code!