Fix regressions from shared forms refactoring.