2 files changed, 3 insertions, 3 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index f93000e85..05d36e89d 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -210,7 +210,7 @@ Individual switch class.
 =end #'#"#`#
     def parse(arg, *val)
       if block
-	val = conv.yield(*val) if conv
+	val = conv.yield(*val)
 	return arg, block, val
       else
 	return arg, nil
@@ -1285,7 +1285,7 @@ Default options, which never appear in option summary.
 =end #'#"#`#
   accept(Object) {|s|s or s.nil?}
 
-  accept(NilClass)
+  accept(NilClass) {|s|s}
 
 =begin
 : String
diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb
index b24de88b7..5bdcf57c9 100644
--- a/lib/optparse/uri.rb
+++ b/lib/optparse/uri.rb
@@ -3,4 +3,4 @@
 require 'optparse'
 require 'uri'
 
-OptionParser.accept(URI) {|s| [URI.parse(s)] if s}
+OptionParser.accept(URI) {|s| URI.parse(s) if s}