Better way to solve bounds checking weirdness - use the small wrapper.