getlantern/lantern#1606 Code review updates