[529044] Refactoring for style, string safety, and completeness.
8 files changed