We no longer need to merge in these options. Fixes #52.