getlantern/lantern#1762 Suggested improvements to original fix

@myleshorton Suggestions from my review of your changes
I went ahead and incorporated my suggestion of naming masquerade sets.