This refactor was left out of the previous commit to make the diff less
noisy and easier to review. There should be no change in behavior.