No changes are introduced to code body. This commit will not build; it is done to permit a better diff in later commits.