Further consolidation of code reading Python source.