Comment fix.
Whoops bad logic.
Use theming function to lay out the form. Ref VOP-585.

Rather than messing with the form structure, which becomes a pain with
the fields.