Sync from GitHub: Refactor analyzer into mixin modules for maintainability

98c5587