MATH_DEBUG changes from bug #4468.