Clean up awkward deprecated argument passing