Backed out error macro modifications since people use "x << y" params.  Thus precedence problems with operator<< remain unsolved.
Backed out error macro modifications since people use "x << y" params. 
Thus precedence problems with operator<< remain unsolved.

28msec/zorba,cezarfx/zorba,bgarrels/zorba,28msec/zorba,cezarfx/zorba,cezarfx/zorba,bgarrels/zorba,bgarrels/zorba,bgarrels/zorba,bgarrels/zorba,cezarfx/zorba,28msec/zorba,cezarfx/zorba,cezarfx/zorba,28msec/zorba,28msec/zorba,cezarfx/zorba,bgarrels/zorba,cezarfx/zorba,bgarrels/zorba,cezarfx/zorba,28msec/zorba,28msec/zorba,28msec/zorba,cezarfx/zorba,bgarrels/zorba,28msec/zorba