More python3 modernization.