Some unstaged changes for python-ctypes