Add more bounds checking on assertions.