Better bounds checking.