Finalize v1 of new style instructions