Fix uninitialized value crash

This change is obsolete, however.
Merge remote-tracking branch 'origin/styleguide-conformance' into lb-refactor