Some mostly cosmetic changes to CSRF