should you set emitOptionSet = true in this branch as well?  If not, please add a comment why not.

Also this pull request is against your own repo, not mixxxdj