Moved remaining calls to errs.merge