Argument count refix