Left out the NDEBUG in the previous checkin.