r253460 accidentally some moderately expensive debugging code, even
when debugging isn't enabled.  Work around this.

Submitted by:	mav
Obtained from:	Netflix
MFC after:	3 days