That was a little too fast. We still need to convert parents of fields to <div>s so to prevent invalid HTML.