More cleanup towards automated Python translation.