Fix problem with top level choice elements not being saved correctly.