remove requirement that container is or includes a form, addresses #30