Merge pull request #40618 from gottesmm/pr-d3608d451d1e66f7ef8a30468cdbad0b78f44e8e

[move-function] Some refactorings in preparation for defer

Author: gottesmm