diff --git a/builtins/2.7/signal.pyi b/builtins/2.7/signal.pyi
index af654b837..1c9481beb 100644
--- a/builtins/2.7/signal.pyi
+++ b/builtins/2.7/signal.pyi
@@ -51,7 +51,7 @@ _HANDLER = Union[Callable[[int, FrameType], None], int, None]
 def alarm(time: int) -> int: ...
 def getsignal(signalnum: int) -> _HANDLER: ...
 def pause() -> None: ...
-def setitimer(which: int, seconds: float, interval: float = None) -> Tuple[float, float]: ...
+def setitimer(which: int, seconds: float, interval: float = ...) -> Tuple[float, float]: ...
 def getitimer(which: int) -> Tuple[float, float]: ...
 def set_wakeup_fd(fd: int) -> int: ...
 def siginterrupt(signalnum: int, flag: bool) -> None:
diff --git a/builtins/2.7/thread.pyi b/builtins/2.7/thread.pyi
index 8c2a8d48c..a54a946a4 100644
--- a/builtins/2.7/thread.pyi
+++ b/builtins/2.7/thread.pyi
@@ -6,8 +6,8 @@ def _count() -> int: ...
 class error(Exception): ...
 
 class LockType:
-    def acquire(self, waitflag: int = None) -> bool: ...
-    def acquire_lock(self, waitflag: int = None) -> bool: ...
+    def acquire(self, waitflag: int = ...) -> bool: ...
+    def acquire_lock(self, waitflag: int = ...) -> bool: ...
     def release(self) -> None: ...
     def release_lock(self) -> None: ...
     def locked(self) -> bool: ...
@@ -21,8 +21,8 @@ class _local(object):
 class _localdummy(object):
     pass
 
-def start_new(function: Callable[..., Any], args: Any, kwargs: Any = None) -> int: ...
-def start_new_thread(function: Callable[..., Any], args: Any, kwargs: Any = None) -> int: ...
+def start_new(function: Callable[..., Any], args: Any, kwargs: Any = ...) -> int: ...
+def start_new_thread(function: Callable[..., Any], args: Any, kwargs: Any = ...) -> int: ...
 def interrupt_main() -> None: ...
 def exit() -> None:
     raise SystemExit()
@@ -30,4 +30,4 @@ def exit_thread() -> Any:
     raise SystemExit()
 def allocate_lock() -> LockType: ...
 def get_ident() -> int: ...
-def stack_size(size: int = None) -> int: ...
+def stack_size(size: int = ...) -> int: ...
diff --git a/stdlib/2.7/argparse.pyi b/stdlib/2.7/argparse.pyi
index ddbf93979..375726d07 100644
--- a/stdlib/2.7/argparse.pyi
+++ b/stdlib/2.7/argparse.pyi
@@ -133,8 +133,7 @@ class _ActionsContainer:
         required: bool = None,
         help: str = None,
         metavar: str = None,
-        dest: str = None,
-    ) -> None: ...
+        dest: str = None) -> None: ...
     def add_argument_group(self, *args, **kwargs): ...
     def add_mutually_exclusive_group(self, **kwargs): ...
 
diff --git a/stdlib/3/argparse.pyi b/stdlib/3/argparse.pyi
index cdbff50c0..39b31957e 100644
--- a/stdlib/3/argparse.pyi
+++ b/stdlib/3/argparse.pyi
@@ -126,7 +126,7 @@ class _ActionsContainer:
         required: bool = None,
         help: str = None,
         metavar: str = None,
-        dest: str = None,
+        dest: str = None
     ) -> None: ...
     def add_argument_group(self, *args, **kwargs): ...
     def add_mutually_exclusive_group(self, **kwargs): ...
diff --git a/stdlib/3/email/message.pyi b/stdlib/3/email/message.pyi
index 1acd10e85..b01ab8bc7 100644
--- a/stdlib/3/email/message.pyi
+++ b/stdlib/3/email/message.pyi
@@ -59,8 +59,8 @@ class MIMEPart(Message):
     def get_body(self, preferencelist=...): ...
     def iter_attachments(self): ...
     def iter_parts(self): ...
-    def get_content(self, *args, *, content_manager=None, **kw): ...
-    def set_content(self, *args, *, content_manager=None, **kw): ...
+    def get_content(self, *args, content_manager=None, **kw): ...
+    def set_content(self, *args, content_manager=None, **kw): ...
     def make_related(self, boundary=None): ...
     def make_alternative(self, boundary=None): ...
     def make_mixed(self, boundary=None): ...
diff --git a/stdlib/3/textwrap.pyi b/stdlib/3/textwrap.pyi
index e02f020eb..c5ddebe2f 100644
--- a/stdlib/3/textwrap.pyi
+++ b/stdlib/3/textwrap.pyi
@@ -19,7 +19,7 @@ class TextWrapper:
             break_on_hyphens: bool = True,
             drop_whitespace: bool = True,
             max_lines: int = None,
-            placeholder: str = ' [...]',
+            placeholder: str = ' [...]'
     ) -> None:
         self.width = width
         self.initial_indent = initial_indent
@@ -73,7 +73,7 @@ def wrap(
         break_on_hyphens: bool = True,
         drop_whitespace: bool = True,
         max_lines: int = None,
-        placeholder: str = ' [...]',
+        placeholder: str = ' [...]'
 ) -> List[str]:
     ...
 
@@ -90,7 +90,7 @@ def fill(
         break_on_hyphens: bool = True,
         drop_whitespace: bool = True,
         max_lines: int = None,
-        placeholder: str = ' [...]',
+        placeholder: str = ' [...]'
 ):
     ...
 
@@ -107,7 +107,7 @@ def shorten(
         break_on_hyphens: bool = True,
         drop_whitespace: bool = True,
         # Omit `max_lines: int = None`, it is forced to 1 here.
-        placeholder: str = ' [...]',
+        placeholder: str = ' [...]'
 ):
     ...