Removed the use of old_args - thanks Reiser.