More errorformar adjustments for OClint.