Minor cleanup.
Merged frostwire-common changes
Cleanup.