Peter Collingbourne:  Fix warnings when compiling with -DNDEBUG.