Mostly, remove the global assumption that all ranges have size 8. I should have called this out during the initial review.