Tweak structure of migrations

There are no programmatic changes to the migrations here, as that would
defeat the purpose of migrations. This is simply a style cleanup of the
automatically generated classes.