A.1.4.1 Clean up pre-python 2.2 constructs

Cleaned up and replaced many pre-python 2.2 constructs.