Refactor cmdSet again.
The Comment Fairy - Part 3: The Comment Santa