revert 6b7fdc7da17b974d5ab04719a7a559076a03b0ce.

These were variables in used only when --enable-cassert.
This fixup changes these variables are not used, but equivalent checks.
Merge branch 'master' into numeric