Improved argument handling after feedback from @codedance