Remove `options` and `callback` fixup.

Closes #18.