Fix the analyzer build due to command refactoring