Fix #70 and #350: options were messed up because of Command.merge_options()

Pull request #918 seems to be a prerequisite.

After this get merged, we should try merging pull request #904.