Remove old code
Fix option toggling.
Ensure lisp switches are passed in correctly.
Fix args display code so it can code with non-string values.