Fix params passed to internal funcs

This is for #10074 -- see discussion there.