Remove some redundant Python 2 support code.