(No version change)

More code movement.