7e54dd1ddb
This makes the code more readable on its own, and also sets the stage for more cleanly handling the pointer provenance lints in a following commit.