Support extra options on upserts

Fixes #102.