Minor updates to `data.form()`