Code

Improve parsing of the set command and variable arguments options