Minor refactor.
Merged frostwire-common changes