py-1.04: code cleanup