Remove debug code.
Fix problem where option was being permanently screwed up because of assignments passed by reference.