diff --git a/builtins/2.7/_codecs.pyi b/builtins/2.7/_codecs.pyi
index 63d70fdba..45a18de15 100644
--- a/builtins/2.7/_codecs.pyi
+++ b/builtins/2.7/_codecs.pyi
@@ -1,88 +1,55 @@
 """Stub file for the '_codecs' module."""
-# This is an autogenerated file. It serves as a starting point
-# for a more precise manual annotation of this module.
-# Feel free to edit the source below, but remove this header when you do.
 
-from typing import Any, List, Tuple, Dict, Generic
+from typing import Any, AnyStr, Callable, Tuple, Optional
 
-def ascii_decode(a, *args, **kwargs) -> tuple: ...
+import codecs
 
-def ascii_encode(a, *args, **kwargs) -> tuple: ...
+# For convenience:
+_Handler = Callable[[Exception], Tuple[unicode, int]]
 
-def charbuffer_encode(*args, **kwargs) -> tuple: ...
+# Not exposed. In Python 2, this is defined in unicode.c:
+class _EncodingMap(object):
+    def size(self) -> int: ...
 
-def charmap_build(a: str) -> Any: ...
+def register(search_function: Callable[[str], Any]) -> None: ...
+def register_error(errors: str, handler: _Handler) -> None: ...
+def lookup(a: str) -> codecs.CodecInfo: ...
+def lookup_error(a: str) -> _Handler: ...
+def decode(obj: Any, encoding:str = ..., errors:str = ...) -> Any: ...
+def encode(obj: Any, encoding:str = ..., errors:str = ...) -> Any: ...
+def charmap_build(a: unicode) -> _EncodingMap: ...
 
-def charmap_decode(a, *args, **kwargs) -> tuple: ...
-
-def charmap_encode(a, *args, **kwargs) -> tuple: ...
-
-def decode(a, *args, **kwargs) -> Any: ...
-
-def encode(a, *args, **kwargs) -> Any: ...
-
-def escape_decode(a, *args, **kwargs) -> tuple: ...
-
-def escape_encode(a: str, *args, **kwargs) -> tuple: ...
-
-def latin_1_decode(a, *args, **kwargs) -> tuple: ...
-
-def latin_1_encode(a, *args, **kwargs) -> tuple: ...
-
-def lookup(a: str) -> Any: ...
-
-def lookup_error(a: str) -> Any: ...
-
-def raw_unicode_escape_decode(a, *args, **kwargs) -> tuple: ...
-
-def raw_unicode_escape_encode(a, *args, **kwargs) -> tuple: ...
-
-def readbuffer_encode(a, *args, **kwargs) -> tuple: ...
-
-def register(*args, **kwargs) -> None: ...
-
-def register_error(a: str, b) -> None: ...
-
-def unicode_escape_decode(a, *args, **kwargs) -> tuple: ...
-
-def unicode_escape_encode(a, *args, **kwargs) -> tuple: ...
-
-def unicode_internal_decode(a, *args, **kwargs) -> tuple: ...
-
-def unicode_internal_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_be_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_be_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_ex_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_le_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_16_le_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_be_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_be_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_ex_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_le_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_32_le_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_7_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_7_encode(a, *args, **kwargs) -> tuple: ...
-
-def utf_8_decode(a, *args, **kwargs) -> tuple: ...
-
-def utf_8_encode(a, *args, **kwargs) -> tuple: ...
+def ascii_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def ascii_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def charbuffer_encode(data: AnyStr, errors: str = ...) -> Tuple[str, int]: ...
+def charmap_decode(data: AnyStr, errors: str = ..., mapping: Optional[_EncodingMap] = ...) -> Tuple[unicode, int]: ...
+def charmap_encode(data: AnyStr, errors: str, mapping: Optional[_EncodingMap] = ...) -> Tuple[str, int]: ...
+def escape_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def escape_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def latin_1_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def latin_1_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def raw_unicode_escape_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def raw_unicode_escape_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def readbuffer_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def unicode_escape_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def unicode_escape_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def unicode_internal_decode(data: AnyStr, errors:str = ...) -> Tuple[unicode, int]: ...
+def unicode_internal_encode(data: AnyStr, errors:str = ...) -> Tuple[str, int]: ...
+def utf_16_be_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_16_be_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_16_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_16_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_16_ex_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_16_le_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_16_le_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_32_be_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_32_be_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_32_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_32_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_32_ex_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_32_le_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_32_le_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_7_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_7_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...
+def utf_8_decode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[unicode, int]: ...
+def utf_8_encode(data: AnyStr, errors:str = ..., final:int = ...) -> Tuple[str, int]: ...