Attempt to make all arg arrays play nice with new prep