Test optional arguments, fix handling of them.