Fix bad rebase and use form uniqueness constraint.