Metadata: Fix the form helper so it doesn't mutate arguments