Put NDEBUG in.
Reverted changes that make no difference.