Split into two commits: the first commit does a mechanical refactoring but contains no (intended) functional changes.

The second commit contains the 3 lines of functional change.