Improve the code to list the field + Use form as reference

We can have a more efficient algorithm to determine when to stop when we are listing the fields available as options in the handler.
The $form in the option_validate() should also be passed as reference.
Here is a patch for that.