(bug 5292) Refactor ESN Reply migration code

La la la!

( not using migrate_prop_to_esn because one of these isn't really a prop )