Support -x -x style arguments.
Removed unused variable.
More protected