Fix mail upgrade steps so they can safely be run a second time.

Also deal with the broken tuple schema when setting defaults.