Everything should now work again.

See the comments for the .h files mass checkin (e.g. pystate.h) for
more detail.