Make the form.fill a little smarter around field deps