Continue merging in changes from resolve-shadow-warnings. funcs/ this time.