improved final argument handling