auth.py: Clean up, round 1.