Cleanup.
Merged frostwire-common changes