[fix] Revert accidental renamings from last commit.

Python-2.7.13/setup.py

@@ -1478,7 +1478,7 @@ class db_found(Exception): pass
         # The pyexpat module was written by Paul Prescod after a prototype by
         # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
         # of a system shared libexpat.so is possible with --with-system-expat
-        # configure opt_num.
+        # configure option.
         #
         # More information on Expat can be found at www.libexpat.org.
         #
@@ -2100,7 +2100,7 @@ def detect_ctypes(self, inc_dirs, lib_dirs):
             # when it shouldn't. The proper fix would be to rewrite
             # the assembler code to be PIC.
             # This only works with GCC; the Sun compiler likely refuses
-            # this opt_num. If you want to compile ctypes with the Sun
+            # this option. If you want to compile ctypes with the Sun
             # compiler, please research a proper solution, instead of
             # finding some -z option for the Sun compiler.
             extra_link_args.append('-mimpure-text')

osh/builtin.py

@@ -169,7 +169,7 @@ def _AppendParts(s, spans, max_results, join_next, parts):
 # sys.stdin.readline() in Python has buffering!  TODO: Rewrite this tight loop
 # in C?  Less garbage probably.
 # NOTE that dash, mksh, and zsh all read a single byte at a time.  It appears
-# to be required by POSIX?  Could try libc getline and make this an opt_num.
+# to be required by POSIX?  Could try libc getline and make this an option.
 def ReadLineFromStdin():
   chars = []
   while True:

osh/word_parse.py

@@ -1247,7 +1247,7 @@ def _ReadCompoundWord3(self, lex_mode, eof_type, empty_ok):
           # Look ahead for $strfunc(x)
           #   $f(x) or --name=$f(x) is allowed
           #   but "--name=$f(x)" not allowed?  This would BREAK EXISTING CODE.
-          #   It would need a parse opt_num.
+          #   It would need a parse option.
 
           next_id = self.lexer.LookAhead(lex_mode_e.ShCommand)
           if next_id == Id.Op_LParen: