Add tooling that will useful in future updates, paying particular attention to difficult cases where only the upper bits on the input vary.