- remove some old hacks now that we require Python 2.2
- reduce the scope of a try block to only wrap what needs to be
  checked