Remove unused option parser
Simplify code
Rework option parser to support ‘--’ as escape sequence