just a few more minor refactorings. trying to make #form_builder easier to understand