Let's add an arg to the existing form_field_row panel instead of duplicating most of it here.  Let's discuss when you have a chance?