[887] Respect the form buffer!

resolves #887

- general refactor
  - only `field_set_and_list_wrapping` has its behavior changed