Cut back on modifying options in the callee

Partially fixes #15.