Fix form populating with array names
Clean up a little code in the form builder.
Merge branch '4.0'