This fixes a bug that can cause core dumps when doing seeks in input
StringIO objects. This has a number of other clean-ups.