Python-Katun-12: A bit more cleanup.