* removed unimportant/implemented lines.
+ moved error reporting to the binary, so tests keep working.
|\ merge from fix-error-reporting.