Finish up the bulk of the converion to argument lists for flx.