Merge pull request from reliqui/analysis-XV4xZ6 Apply fixes from StyleCI