Move upsert query fields onto schema options for semantics.