Some form cleanups; fixed recently introduced issue with auto-widget-* expansion being overridden with a form merge