Cleanup to Python specs.