More work on making formbuilder more JS-modular