Refactor to match pending migrations.