Updated OptionParser to use the static helper functions added to Option