Change INSERT and UPSERT syntax to allow keys to exist outside of values.