Prepare to move away from string argument definitions entirely