Prefer that instead of continuing to tie this to the form we tie to the document instead.