Migrating to a structure that's more terse and easier to work with.