'CERROR's.  Also contains a lot of cleanup, removing things like __FUNCTION__
from CDEBUG and CERROR statements which already display that information.