Convert a first batch of diagnostics to have error codes