Major refactoring with CodeMaid.
Build 5433.