Interface argument rearrangement.

Test, Stub wip.