Cleaning up some nested form behavior