Improvements to Python 2 builtins stubs