Simplified the form state checking, fixed bugs

This simplifies the checking that determines the state of the default
values for the form. It also prevents the default values from overriding
the choices spelled out in the node edit, while still setting content
type defaults for an unedited pollfield.