Some more semplifications in error reporting.