basic changes to beef up coverage a tiny bit + restore compatibility with python2.4 (since we still claim to support it)