I went with the "fix the form" way because it broke less unit tests. Still not sure this is the best solution