Refactor for niceness.

Dedupe destination option code.