Reactivated some old argument creation stuff for testing.