Refactor ballot editing form to discard organisation array early, and to unify pre-supplied
data